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

(Portage version: 2.1.10.41/cvs/Linux x86_64)

5 files changed, 99 insertions, 3 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/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 )"