Add patch to fix tests, add ruby20 and ruby21 support.

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

4 files changed, 85 insertions, 7 deletions

diff --git a/dev-ruby/journey/ChangeLog b/dev-ruby/journey/ChangeLog
index 2741a64f08d8..3e8d71161258 100644
--- a/dev-ruby/journey/ChangeLog
+++ b/dev-ruby/journey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/journey
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/journey/ChangeLog,v 1.9 2014/04/05 23:28:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/journey/ChangeLog,v 1.10 2014/05/04 13:07:01 mrueg Exp $
+
+*journey-1.0.4-r1 (04 May 2014)
+
+  04 May 2014; Manuel Rüger <mrueg@gentoo.org>
+  +files/journey-1.0.4-fix-tests.patch, +journey-1.0.4-r1.ebuild,
+  -journey-1.0.4.ebuild:
+  Add patch to fix tests, add ruby20 and ruby21 support.
 
   05 Apr 2014; Manuel Rüger <mrueg@gentoo.org> journey-1.0.4.ebuild:
   Remove ree18 and ruby18 target.
diff --git a/dev-ruby/journey/Manifest b/dev-ruby/journey/Manifest
index bbed3b131c7d..7a8632ba9dd4 100644
--- a/dev-ruby/journey/Manifest
+++ b/dev-ruby/journey/Manifest
@@ -1,4 +1,5 @@
+AUX journey-1.0.4-fix-tests.patch 2149 SHA256 3d6a107d54bb0a17640e81769c163f928cf17fb181460c8df4e96e20215ea4a5 SHA512 d4b34ed92f131e6e17f4af6d9be5ec743b6950f86ee724d32be67fe88b378cd8998c6551e78d6dc7b72b2911afbb14ec8ddad3be414694b86c696a39513a2857 WHIRLPOOL 3688902264d25b3e49ee0ce0e356497e2569c6f795956e91ca272b9761c7732cb0d11c221b45277830835b663b906ec9ea5a70560bb444882897b54dbf13ca9e
 DIST journey-1.0.4.gem 28672 SHA256 7454b8612530784000fbb17ea2df749a71b70702a0ac8ebef4a1e7f05aecc10f SHA512 9e6a06da8b77f6efb9941c58f53254e8cf3a1ebb6f8261a66ef3fed9c21ff4e4a90567fee88507b8e2c1fecc0fbdf204a9d3c8473b671bbb4b8c6b9faa6f2a07 WHIRLPOOL 1fb1ff42d1cd401ad10dc22e8d705933d8ff5fc84f952e3fbf0e2ea77b0ecc4ac08280ee5e2bd23b3cbeb4729e23b2c5ca41f3ce49deb898033073dc7be418b1
-EBUILD journey-1.0.4.ebuild 720 SHA256 18cf6b2fb5135fe686dd1163e38d4ea5f205d97100146260388c2f939c389a3b SHA512 afad87906ce8f43540ca5f92ebacf44d320ee9437a71c53f3a7a4fac357b0cd111a597d1317d952a13c7f2bd1386f278f41bf8fd58205d9fea9519b45c3d0eff WHIRLPOOL 16b7484916ac6bd56b5184102ad5e7c8dc5fa4cc627ee33255ef2aa637ca53a05b321dc1f4672fd5d5096490ca5446e8766b2fd7bb6475ac7c9567096290db4f
-MISC ChangeLog 1245 SHA256 d5deae13c3fc474828c54316542b3575a04da08d5bcaf9aee4bde94fa2dafae3 SHA512 d7e4c8c46d5ccb6539975cfe2ce742b14ee32381e3e1f333edf7ef58e1c88920948e2bea872f8a7089a369e735d416a7cf311c53785bb084247d794a79d44152 WHIRLPOOL 27778b97461f518c72dd8fb0f9717d720701fcee046674049551a48c0a75a982abbc5c11ed4210b315e1f1fcbd66e9645dea4848d506b2981430880aabe6db6a
+EBUILD journey-1.0.4-r1.ebuild 792 SHA256 306ddd00a58fa89f8adb4f7ba0e7102bd6d9142aa43139c0f7a954a0a52d0918 SHA512 5e347240952ef40fd47e203ee1c4999cb3e9822bcba84468cd98777589270ae0fa80341be6c09acf76d4da4cf160cc87554c92d7aaaa478434314e044f357f34 WHIRLPOOL 86f7f8ef5cef00c627bed0841e848f81f2fc85440b409cf6b15b82fc7cbecada1de5175e8e1899dd854d2075eac46febd24c982ba736fb79cbc0820bd27f155d
+MISC ChangeLog 1476 SHA256 f10fd78e8f5df36a4d24cb183eb0ff94373864fad3956419f6a0d40b7d5698e3 SHA512 69f6f596a0a9142b8f7cef1c8f9372cd9bfc82fcd036e05f2ffe2bfe44842d5bafb988fec9b97deeff936dda843335cdee8c7833c6eb9c3a75cf311197e73c83 WHIRLPOOL e49329ece9a99d771a62aceaf8cdaaced84fda590d727b99761bebbac1eb8abb28c87053de5d26f80d79340f4d9ca552e688b050dc1539bd504b07c000f55875
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
diff --git a/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch b/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch
new file mode 100644
index 000000000000..f977172e6464
--- /dev/null
+++ b/dev-ruby/journey/files/journey-1.0.4-fix-tests.patch
@@ -0,0 +1,66 @@
+From d836e960d9a20c4c5bc986630d2ba34a340959ea Mon Sep 17 00:00:00 2001
+From: Aaron Patterson <aaron.patterson@gmail.com>
+Date: Fri, 27 Jul 2012 11:20:58 -0700
+Subject: [PATCH] fix assertion calls
+
+---
+ test/path/test_pattern.rb | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/test/path/test_pattern.rb b/test/path/test_pattern.rb
+index c684a0a..ec93471 100644
+--- a/test/path/test_pattern.rb
++++ b/test/path/test_pattern.rb
+@@ -85,9 +85,9 @@ def test_to_regexp_with_extended_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/tender', path)
+-        assert_match('/page/love', path)
+-        refute_match('/page/loving', path)
++        assert_match(path, '/page/tender')
++        assert_match(path, '/page/love')
++        refute_match(path, '/page/loving')
+       end
+ 
+       def test_optional_names
+@@ -108,8 +108,8 @@ def test_to_regexp_match_non_optional
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/123', path)
+-        refute_match('/', path)
++        assert_match(path, '/123')
++        refute_match(path, '/')
+       end
+ 
+       def test_to_regexp_with_group
+@@ -119,9 +119,9 @@ def test_to_regexp_with_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/tender', path)
+-        assert_match('/page/love', path)
+-        refute_match('/page/loving', path)
++        assert_match(path, '/page/tender')
++        assert_match(path, '/page/love')
++        refute_match(path, '/page/loving')
+       end
+ 
+       def test_ast_sets_regular_expressions
+@@ -186,9 +186,9 @@ def test_insensitive_regexp_with_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/TENDER/aaron', path)
+-        assert_match('/page/loVE/aaron', path)
+-        refute_match('/page/loVE/AAron', path)
++        assert_match(path, '/page/TENDER/aaron')
++        assert_match(path, '/page/loVE/aaron')
++        refute_match(path, '/page/loVE/AAron')
+       end
+ 
+       def test_to_regexp_with_strexp
+-- 
+1.9.1
+
diff --git a/dev-ruby/journey/journey-1.0.4.ebuild b/dev-ruby/journey/journey-1.0.4-r1.ebuild
index 5648c979a5bd..fc40c5c9928b 100644
--- a/dev-ruby/journey/journey-1.0.4.ebuild
+++ b/dev-ruby/journey/journey-1.0.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/journey/journey-1.0.4.ebuild,v 1.4 2014/04/05 23:28:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/journey/journey-1.0.4-r1.ebuild,v 1.1 2014/05/04 13:07:01 mrueg Exp $
 
-EAPI=4
-USE_RUBY="ruby19"
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
 
 RUBY_FAKEGEM_TASK_DOC="docs"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -21,4 +21,8 @@ KEYWORDS="~amd64 ~arm ~x86 ~x64-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/hoe )"
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/json dev-ruby/minitest )"
+ruby_add_bdepend "test? ( dev-ruby/hoe
+	dev-ruby/json
+	dev-ruby/minitest )"
+
+RUBY_PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )