Version bump. Add ruby19. Drop arches due to new dependency, bug 396291.

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

6 files changed, 108 insertions, 8 deletions

diff --git a/dev-ruby/sinatra/ChangeLog b/dev-ruby/sinatra/ChangeLog
index a7c9bf0cf8c5..9d7a8ed2399d 100644
--- a/dev-ruby/sinatra/ChangeLog
+++ b/dev-ruby/sinatra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/sinatra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.25 2011/10/03 05:39:48 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.26 2011/12/28 12:32:35 graaff Exp $
+
+*sinatra-1.3.1 (28 Dec 2011)
+
+  28 Dec 2011; Hans de Graaff <graaff@gentoo.org> sinatra-1.2.7.ebuild,
+  +sinatra-1.3.1.ebuild, +files/sinatra-1.3.1-rdoc-require.patch,
+  +files/sinatra-1.3.1-rdoc-tests.patch:
+  Version bump. Add ruby19.
 
 *sinatra-1.2.7 (03 Oct 2011)
 
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 8182c1252562..872a5600936f 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -2,18 +2,22 @@
 Hash: SHA256
 
 AUX sinatra-1.0-haml3-tests.patch 4084 RMD160 9eb0f8b7f49d15248498b8b524dfb325248a0884 SHA1 a263c0c038f594ae56a048ffa6f0e117f5a73047 SHA256 0c8e0d74816bdceabe170dee8f160fc24f7c35c9ea8b3843a114f9d9e039bec2
+AUX sinatra-1.3.1-rdoc-require.patch 475 RMD160 96d33b05c06c610d884198b3cf731ef4f4dc78df SHA1 5ccab7d0f890aa2beecd0fb79fcda00036456358 SHA256 de203f75fe7eabb33fe6845aa20ba0aad446558a511d6981c684d3b602e1a8ee
+AUX sinatra-1.3.1-rdoc-tests.patch 1260 RMD160 5214550b71dc3799d4fbd77ef52f177e7eea02f7 SHA1 2c59e18ab94d62ffee0638d0c8eb7e86b226e25d SHA256 407b089cdcd6f2771a0acb1dd26a07d76d223be14399c159e1b9f9470c7c08d0
 DIST sinatra-1.0.gem 121856 RMD160 90b5c985f494574141c0cf33144d2cf206f0eaed SHA1 0f79a20ae46eedd387d5b93a823ecc1f9c4133bb SHA256 8a79ad3209baf34a4dfef6079a5461c381c755750f8a1234c36144a838f67a8a
 DIST sinatra-1.2.6.gem 245248 RMD160 4bd2ed53b29b99d25531f4be08436f4bb74b5b5c SHA1 74674a7a42676446d0acc01c2d5689c768daa6cf SHA256 0cbda20fdaafe5f47390105cd33787a6af6130ff0181d7b3c2460dc26595b7fb
 DIST sinatra-1.2.7.gem 246784 RMD160 9c183f2d60a1892bb22b0f4380bc311fdc2ba157 SHA1 f03713e7be0a271dbd049fd93cc09cd3662185ed SHA256 5798f6400830308da34ac09cd321dd73402bf27c8fc77b92636634e609628195
+DIST sinatra-1.3.1.gem 273408 RMD160 5137f227e16d22fa6988b59edf000e21ec7a809c SHA1 8d49048bafaaf0989908b384589955d6e6c33730 SHA256 7815776bf0bbc7f5729c12cfae504cd86304afe03985a17f3df1aa9ad461749b
 EBUILD sinatra-1.0-r1.ebuild 958 RMD160 59cae71217eae4e7639ba92500ef3b55d3b7e8bf SHA1 55637533d80ba2d41cccebc8337ad1051456da5c SHA256 c00af16eceda4ca41dfe9dbe4af259cd94bda846b4ed0efa142543cc9f8b0aeb
 EBUILD sinatra-1.2.6.ebuild 801 RMD160 1890ef9d9d9718909d1398e56a7d42dc02791d37 SHA1 acc0768d11bbd8cb9a0b6067d669770115f06240 SHA256 40d50cfc2eadd3380586acf0d9e75a9257c5e0ffb35031e6c7748a6d31aa5ab3
-EBUILD sinatra-1.2.7.ebuild 800 RMD160 ea6292d1804975c5431c6437cd4b94274c035373 SHA1 08952ca9022bdce73d80ea906b2810c528a983a0 SHA256 8be7a3d0c76a9c72c03f79f6833e957e4ec9d92b8368573fbd2ff5ddb98186e5
-MISC ChangeLog 3808 RMD160 ebc0c1e58661809b3b9b1ad78939308cb90b722f SHA1 38600d1ac4bf7d2542c0a9157f8e4a8d705908d2 SHA256 677907db82bc3a7c0549f035402dab9957d26e9ba21c2a8db0b5d59b144740fc
+EBUILD sinatra-1.2.7.ebuild 807 RMD160 086e5e45b59cbbe7021bbf0b43e641b77580ceab SHA1 ebc371fba7b84ee2826f4702a05dc054308fb1ec SHA256 7ef5a369080101e925bf0564e88225d28d55573b5cc8ad2333a7c34336bff8a7
+EBUILD sinatra-1.3.1.ebuild 920 RMD160 d54ae7e4555c0b5a6d223fb2bfa90706c674c579 SHA1 bf29cde082bb9925a9d509b86149bd31fe037dcf SHA256 e6b4d22b6396d44fddb976fb3ccf8efe5bfad466943346b59fa184e6501b0cac
+MISC ChangeLog 4046 RMD160 6ec60a10f33dc9cda1a2dfdb9727c1516b672da7 SHA1 e9c34715b24d600204c649a9348e03c8a8dee4a3 SHA256 d6ddd7a41ce8762f1b646f241bfd9e1019c80411becd38ad966f8971a1451baf
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6JSqoACgkQiIP6VqMIqNdbRwD/ax2VstCT347jqBN9bc3ogDUD
-cPtH7y6YuoCfFJSvF2YA/0vWW/p4TyTamsbMHzjIYjO0fC+Prv1+gmvbRUSurYPG
-=K07d
+iF4EAREIAAYFAk77DGkACgkQiIP6VqMIqNcrHAD+MzYXR9RP4GGXh3QYNkT+sMnf
+ZArv73qn/8/wxNjTEX8A+gIStcreO7rvqSaiLpX71Sqvn/5+rnbVn8ElctFygg0K
+=tSPh
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/sinatra/files/sinatra-1.3.1-rdoc-require.patch b/dev-ruby/sinatra/files/sinatra-1.3.1-rdoc-require.patch
new file mode 100644
index 000000000000..0c6fca5ab694
--- /dev/null
+++ b/dev-ruby/sinatra/files/sinatra-1.3.1-rdoc-require.patch
@@ -0,0 +1,18 @@
+commit dc1ff1867096c5ef036c7aff9b55e4e72e4eaa6a
+Author: Tim Felgentreff <timfelgentreff@gmail.com>
+Date:   Mon Oct 10 18:57:14 2011 -0700
+
+    Update rdoc test to work with RDoc 3.10
+
+diff --git a/test/rdoc_test.rb b/test/rdoc_test.rb
+index ff547bc..d28b16a 100644
+--- a/test/rdoc_test.rb
++++ b/test/rdoc_test.rb
+@@ -1,6 +1,7 @@
+ require File.expand_path('../helper', __FILE__)
+ 
+ begin
++require 'rdoc'
+ require 'rdoc/markup/to_html'
+ 
+ class RdocTest < Test::Unit::TestCase
diff --git a/dev-ruby/sinatra/files/sinatra-1.3.1-rdoc-tests.patch b/dev-ruby/sinatra/files/sinatra-1.3.1-rdoc-tests.patch
new file mode 100644
index 000000000000..540781f453a7
--- /dev/null
+++ b/dev-ruby/sinatra/files/sinatra-1.3.1-rdoc-tests.patch
@@ -0,0 +1,43 @@
+commit 3d78b5ee6c18d5776ddf9c7d148158a3604f80e6
+Author: Tim Felgentreff <timfelgentreff@gmail.com>
+Date:   Mon Oct 10 19:50:59 2011 -0700
+
+    fix rdoc tests for 3.10
+
+diff --git a/test/helper.rb b/test/helper.rb
+index 1f061d4..dc8fd40 100644
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -69,7 +69,11 @@ class Test::Unit::TestCase
+   end
+ 
+   def assert_body(value)
+-    assert_equal value.lstrip.gsub(/\s*\n\s*/, ""), body.lstrip.gsub(/\s*\n\s*/, "")
++    if value.respond_to? :to_str
++      assert_equal value.lstrip.gsub(/\s*\n\s*/, ""), body.lstrip.gsub(/\s*\n\s*/, "")
++    else
++      assert_match value, body
++    end
+   end
+ 
+   def assert_status(expected)
+diff --git a/test/rdoc_test.rb b/test/rdoc_test.rb
+index d28b16a..0d58856 100644
+--- a/test/rdoc_test.rb
++++ b/test/rdoc_test.rb
+@@ -16,13 +16,13 @@ class RdocTest < Test::Unit::TestCase
+   it 'renders inline rdoc strings' do
+     rdoc_app { rdoc '= Hiya' }
+     assert ok?
+-    assert_body "<h1>Hiya</h1>"
++    assert_body /<h1[^>]*>Hiya<\/h1>/
+   end
+ 
+   it 'renders .rdoc files in views path' do
+     rdoc_app { rdoc :hello }
+     assert ok?
+-    assert_body "<h1>Hello From RDoc</h1>"
++    assert_body /<h1[^>]*>Hello From RDoc<\/h1>/
+   end
+ 
+   it "raises error if template not found" do
diff --git a/dev-ruby/sinatra/sinatra-1.2.7.ebuild b/dev-ruby/sinatra/sinatra-1.2.7.ebuild
index 5a9eb58bc1a9..875f8c8089f5 100644
--- a/dev-ruby/sinatra/sinatra-1.2.7.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.2.7.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.2.7.ebuild,v 1.1 2011/10/03 05:39:48 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.2.7.ebuild,v 1.2 2011/12/28 12:32:35 graaff Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
 
 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/sinatra/sinatra-1.3.1.ebuild b/dev-ruby/sinatra/sinatra-1.3.1.ebuild
new file mode 100644
index 000000000000..b23f08a36239
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-1.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.3.1.ebuild,v 1.1 2011/12/28 12:32:35 graaff Exp $
+
+EAPI=2
+USE_RUBY="ruby18 ruby19 ree18"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc AUTHORS CHANGES"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort."
+HOMEPAGE="http://www.sinatrarb.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_PATCHES=( ${P}-rdoc-require.patch ${P}-rdoc-tests.patch )
+
+ruby_add_rdepend "=dev-ruby/rack-1* >=dev-ruby/rack-1.3.4
+	>=dev-ruby/rack-protection-1.1.2:1
+	=dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.3"
+ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 >=dev-ruby/haml-3.0 dev-ruby/erubis dev-ruby/builder )"