Version bump. Apply fixes from upstream to pass tests.

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

4 files changed, 86 insertions, 5 deletions

diff --git a/dev-ruby/tilt/ChangeLog b/dev-ruby/tilt/ChangeLog
index d147db7b53eb..242fadbe7768 100644
--- a/dev-ruby/tilt/ChangeLog
+++ b/dev-ruby/tilt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/tilt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.18 2011/12/25 09:13:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/ChangeLog,v 1.19 2011/12/25 09:27:08 graaff Exp $
+
+*tilt-1.3.3 (25 Dec 2011)
+
+  25 Dec 2011; Hans de Graaff <graaff@gentoo.org> +tilt-1.3.3.ebuild,
+  +files/tilt-1.3.3-yajl-test.patch:
+  Version bump. Apply fixes from upstream to pass tests.
 
   25 Dec 2011; Hans de Graaff <graaff@gentoo.org> -tilt-1.2.2.ebuild:
   Remove old version.
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 6f02baf1874a..0e0a96297846 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX tilt-1.3.2-thread_id.patch 830 RMD160 8cec792f32ca7352ccb210c2cf96d2a267ff73c3 SHA1 916ea62ec641a97720f7974bceea2f2e5091dd06 SHA256 5cbdf308a81374dd6bacdc959f77149d6f06a3bce38ef5710adaaeeb3e9a895f
+AUX tilt-1.3.3-yajl-test.patch 1271 RMD160 4a86ba60795c18b667d112369cb9db17ad0bb78d SHA1 60d59ee17c1e2a1ef9101b2bc79d11b70a42b69a SHA256 0d6b137c9333c092436bde716b3779a8ea1ba0494aa280b54ebacf95e6b4447a
 DIST tilt-1.3.2.gem 34304 RMD160 a6fd229332676ced3f9810ee2b9c5b1e4295248b SHA1 afe9478c001f9d193c54fd254d3214bc940bc2cc SHA256 c7e69202794bdfde34395f596023309a3a45725bb292b4c04dba69a5f32f7071
+DIST tilt-1.3.3.gem 36352 RMD160 4372d42c6fa35789041f1f9b4c07d9751af320e4 SHA1 ef7276d8c1870c2111ef017c1abd451b4bcff07f SHA256 48af9536c7699dc0f8f50ba2432b627a3f47f9702d2d25d48dfc2d4a2da20da3
 EBUILD tilt-1.3.2.ebuild 1037 RMD160 c98bd987d050bc683732bd433e3dfc0eda3d9cb4 SHA1 b437c0ab3614f21f09fd82af56257e9015fdd5e2 SHA256 40ec41f0ae1499d5a145f80c54e2548ffc603fa271fd01e92e07392edd889fb1
-MISC ChangeLog 2417 RMD160 727fabaa962f65b0b93f61b631cdc1dae1d161c3 SHA1 802b8320b754bb5670952255394a66e43b093e02 SHA256 6b75ea715d8abfd2782d45c9eac80dd761aa6c23ca82bc933d04cd610a492e14
+EBUILD tilt-1.3.3.ebuild 1220 RMD160 9e54d309e594ae88fb7986fc9ce25c38b4834858 SHA1 5a4da15dafb28e6af2bbfaac16f1e8cac324a52c SHA256 91f4989c6fdc488281c8658404e0def7d577e13dba1f3daaaa856df4d2d4edb8
+MISC ChangeLog 2609 RMD160 b6264a53ab75f25b19645274cbc672e17afe4bc0 SHA1 086e4cd0bdca2131058d1630f92c07fb2c9f1242 SHA256 2d383e9ead795ccfda0741184b593c3538be5e48df46b45fa9d8863e7257a1f8
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk726TwACgkQiIP6VqMIqNeOPQD/TS9dBA/Blm759s4121GifNqE
-JZmzSTL2xUz1kk746BgA+waiW75HVR8c9ZLX3+wqvUIbOXsdlXgaeI8OMEqHsBd2
-=p2hG
+iF4EAREIAAYFAk727HcACgkQiIP6VqMIqNeXOAD9HN/DBMIGVbcO3HmK2vJ4MMSP
+tncexSyAmSVV/gI0e7IA/39j4hLhqLUsEmea9s5ZkeRwDmKKtQfhxqpZTbtHqrXC
+=NoiS
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/tilt/files/tilt-1.3.3-yajl-test.patch b/dev-ruby/tilt/files/tilt-1.3.3-yajl-test.patch
new file mode 100644
index 000000000000..6f81ebcfe040
--- /dev/null
+++ b/dev-ruby/tilt/files/tilt-1.3.3-yajl-test.patch
@@ -0,0 +1,33 @@
+commit c0e076b72e20442cb528010e9436f04a79de1a9b
+Author: Ryan Tomayko <rtomayko@gmail.com>
+Date:   Thu Sep 15 00:37:58 2011 -0700
+
+    fix yajl template test failures due to hash (un)order under 1.8
+
+diff --git a/test/tilt_yajltemplate_test.rb b/test/tilt_yajltemplate_test.rb
+index 5226c16..707f97b 100644
+--- a/test/tilt_yajltemplate_test.rb
++++ b/test/tilt_yajltemplate_test.rb
+@@ -11,12 +11,20 @@ begin
+ 
+     test "compiles and evaluates the template on #render" do
+       template = Tilt::YajlTemplate.new { "json = { :integer => 3, :string => 'hello' }" }
+-      assert_equal '{"integer":3,"string":"hello"}', template.render
++      output = template.render
++      result = Yajl::Parser.parse(output)
++      expect = {"integer" => 3,"string" => "hello"}
++      assert_equal expect, result
+     end
+ 
+     test "can be rendered more than once" do
+       template = Tilt::YajlTemplate.new { "json = { :integer => 3, :string => 'hello' }" }
+-      3.times { assert_equal '{"integer":3,"string":"hello"}', template.render }
++      expect = {"integer" => 3,"string" => "hello"}
++      3.times do
++        output = template.render
++        result = Yajl::Parser.parse(output)
++        assert_equal expect, result
++      end
+     end
+ 
+     test "evaluating ruby code" do
diff --git a/dev-ruby/tilt/tilt-1.3.3.ebuild b/dev-ruby/tilt/tilt-1.3.3.ebuild
new file mode 100644
index 000000000000..9d823db460cf
--- /dev/null
+++ b/dev-ruby/tilt/tilt-1.3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tilt/tilt-1.3.3.ebuild,v 1.1 2011/12/25 09:27:08 graaff Exp $
+
+EAPI=2
+
+# jruby fails tests
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md TEMPLATES.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A thin interface over a Ruby template engines to make their usage as generic as possible."
+HOMEPAGE="http://github.com/rtomayko/tilt"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RUBY_PATCHES=( "${P}-yajl-test.patch" )
+
+ruby_add_bdepend "test? ( virtual/ruby-test-unit dev-ruby/nokogiri )"
+ruby_add_rdepend ">=dev-ruby/builder-2.0.0"
+
+# Tests fail when markaby is not new enough, but it's optional.
+DEPEND="${DEPEND} !!<dev-ruby/markaby-0.6.9-r1"
+RDEPEND="${RDEPEND}"
+
+all_ruby_prepare() {
+	# Remove rdoc template tests since these are no longer compatible
+	# with newer versions.
+	rm test/tilt_rdoctemplate_test.rb || die
+
+	# Avoid test broken due to hash unordering in ruby 1.8. Fixed upstream.
+	sed -i -e '/template can end with any statement/,/ end/ s:^:#:' test/tilt_yajltemplate_test.rb || die
+}