Version bump. Add ruby20.

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

4 files changed, 84 insertions, 6 deletions

diff --git a/dev-ruby/sinatra/ChangeLog b/dev-ruby/sinatra/ChangeLog
index 53c55692e848..4eea2f35acf8 100644
--- a/dev-ruby/sinatra/ChangeLog
+++ b/dev-ruby/sinatra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/sinatra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.44 2013/08/17 06:26:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/ChangeLog,v 1.45 2013/11/21 07:32:19 graaff Exp $
+
+*sinatra-1.4.4 (21 Nov 2013)
+
+  21 Nov 2013; Hans de Graaff <graaff@gentoo.org> +sinatra-1.4.4.ebuild,
+  +files/sinatra-1.4.4-fix-tests.patch:
+  Version bump. Add ruby20.
 
 *sinatra-1.4.3 (17 Aug 2013)
 
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index a3e840672d84..f5d5340ebd9f 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -4,16 +4,19 @@ Hash: SHA256
 AUX sinatra-1.0-haml3-tests.patch 4084 SHA256 0c8e0d74816bdceabe170dee8f160fc24f7c35c9ea8b3843a114f9d9e039bec2 SHA512 d9c8d4b42ad89a6f0a35d43986cdded9ba3ccdcf75e559ea3ac549ab7a72882201a7bf1267552991d29c613caf81ec03626d0f3aadcf67c417df9be28be59e8f WHIRLPOOL 0bff286c9cd8aba364e408b15e8efc572a4cd170c5d6a23d2fbd51f3372b3596b4157150dad58253dab2616d9cb1368c95d2b15015faa135bde83fd8009f6deb
 AUX sinatra-1.3.1-rdoc-require.patch 475 SHA256 de203f75fe7eabb33fe6845aa20ba0aad446558a511d6981c684d3b602e1a8ee SHA512 29d9a54b84dd906c1f007267e9733b88d6a544600e6adce456d5cf2f13256336b8afdde40dd78ef75cfd7e5c536f88c1eb1d43a980c01107a6d7499ba027f9df WHIRLPOOL b28c2eedb01332ed8bb1e863b0cb478c79aece815339b8b5c3128b8482c28c64df0f2f8481ca00fe7e41cee3c980a98286c590aba5e99a15cfa240f2b32d723c
 AUX sinatra-1.3.1-rdoc-tests.patch 1260 SHA256 407b089cdcd6f2771a0acb1dd26a07d76d223be14399c159e1b9f9470c7c08d0 SHA512 f4789a0700e7282a273652d5b13750befcb84ceb5dc97a42a487305e4b0052445e9f03f741ea64742371113a94cefa14113899b40d038dcf3d8b0aa26f77a319 WHIRLPOOL ae36a26e7453f9569a39a1135dae4b1b2cb01d34595d7197843952dd242a74b26fea1340c4f7a45c203551cc8f6b80bf52b678c4053236dff803ff971607b342
+AUX sinatra-1.4.4-fix-tests.patch 795 SHA256 0ca1f49fe9ed6889241a823e9db9cf410509de924e987cf4ff73798b2c9c84a6 SHA512 d3e8f80e93a46319f91b381133758dd9239ac49bebfdb0ffb39215dc1ba05b780f8224f352d2811e75cf1a77122230efc6673c3a92d9945d035fe3638bfbb995 WHIRLPOOL e80043b9b0bd6ae1e4056d80caafb108b4ff31cfdacd4e6667bfca019b765190406d66823f84154a5a1296fb294aaef571900f3dca83aff0fc243c96bae19cf0
 DIST sinatra-1.3.3.gem 306176 SHA256 ef027de9be93511b8b02ff8027c9d9a063f50d5615f3306ed6e0dbe69add8e63 SHA512 f481b0ba9656117e340a5d71f7880748b071652b7a1654137f619975be083c995d5c319013ab37b206abbcec51a74bf68330634c4f9e3eabcb48d673503261c8 WHIRLPOOL 3e8e0dc54fd5bcf77651d27d03aec3c51a1922c02c36b22f154b0c2311ecc6aa7be43a48e2966481392f095a5bd83e4501690c2292a3bfd02111d7129b092058
 DIST sinatra-1.4.3.gem 333312 SHA256 1561dfa634e54e37a1d0cea2291a64f2d2dae34c1c4e875ab8e87b9df9b938a9 SHA512 b7021f0138abbf69fa276f0a84000f66cf320ab03d0c13073070f9976917232d3b6204660bfa1e8cbe3f43de35b023480d77555b79c31380eba8c4144a9153de WHIRLPOOL daf330dbff9aa696573d141ba27872703d7d1099741e3c58a01e9f0d166871bd78f5e0e9ddddbe6086a6676e41c631f8103b7f5593c9f0e8d8ea5ffb46d65024
+DIST sinatra-1.4.4.gem 326656 SHA256 1a16a552d559be0fff6cefd2c84c1fecafcc54668fba540e99fe8f2692033e8a SHA512 f6c2cd9b42de1eaaae2805f02a80c884f46204e566a126299b60c428c87746fcf6189d9f248c63d4c5adbd41e0568ff4860651c7aa2947ac2f51f2690f8c7f51 WHIRLPOOL c347dc36e3ae018d8a3d8b2ce55f327c7d0d79f9c13d9f363f9b2cc14076d748e80ed3a8354c920496fb7f68c711f05acc5aa20850c94a530a82a791c7c318d2
 EBUILD sinatra-1.3.3.ebuild 982 SHA256 7b2935525aca1ace5f559381f9459ec66da219aee524d07b9e67f1c7e521338d SHA512 d201bd685ef57354b8f10358fa981aad75468f589304e3d731602ff168d918d76a772aeb0685dcbec93a6a24762c1b60796c2f66fc9835bb6f71d7fbf2010d58 WHIRLPOOL 292005f14c9cccb8a9f2ffa766a1a40b47d7b11686f6e801083f2f74bfff4abdaa9cb49439ecb222c0a555b14acbe5549b7a0d731c3406ce3bc22b7a4a23cad3
 EBUILD sinatra-1.4.3.ebuild 1383 SHA256 8fd7289898c8e2ff4833506e6df6be41eff5d6c2436bb32e6f35f4dcf6d43ccb SHA512 f4e89c425ab78fd77805564e37251a931efefdb764b98938df332ff4c8664849999b060f052c3085e55251ca69e193b8f11f16154571d5b78d54b76ff388f590 WHIRLPOOL 171d460dc01ebff5369e3f4fb52f7a5bb2829d672eebe3350702dd3acca48ffabf2ee32dcce637c409306c03933a30d9ffd16e8c1ed8d611fe9cc1c10000a635
-MISC ChangeLog 5894 SHA256 c075bc7d3e348b562069100817d27928e6e738d5666aeb5c894edcd07987e299 SHA512 2dc89567b72984d37d88a42ed50c60f0287ba5090abde39e243419b159c378705ebbb751f21e68e517e8df15511e533078280e2402d852ca3d824d00421fac66 WHIRLPOOL 75bcb405e58e2aa1ad744f54ddc82828a57b5e9c53edfed39443d8913f5b00833466311d0f7b7b609522d7135e6ce28b9adcb67074d0179ac9c56fc7dced8a90
+EBUILD sinatra-1.4.4.ebuild 1543 SHA256 33aed63387f1457936dce3599ffb0f2db1eeece34bd7603ff29add81baefe7ad SHA512 bf5ea571181db495673178941eff1ab9ce64c0b25eae5045fca2c8abe7d5f9968a176c99a0895850c32f57a1ecff932855ea29b8c3e742f648fa82165ea874c4 WHIRLPOOL c13d2270c0ab6e5a1c6e219a8e195020506d6c0d56b3ddb5a8ea74f20c57518b91c3fc5309e4d9fe3099cfd55faab65e023a6f2bace8172c3751432311a9c403
+MISC ChangeLog 6066 SHA256 0ac54d1c9cbd3f70e2995b0683430f886105f04ee2a1fec3f840ddc219211900 SHA512 cd53cabd067b62974de4b19d19f2b35648358bc7d2a70501d92254b7de712bb452ebf7dea1f65eb10475d149c9d1cab3eeb218716c8840b7d69a3eb7278f46ed WHIRLPOOL 064d3d8b3f314a3dac6c53db99d4e78dcc2ea1335a50d5c3ac584dd08252ef826980b10bebbdd54f05184999f4aad1ae0d567a8fcb91ccf229d77744901df164
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIPF5cACgkQiIP6VqMIqNcbpQD+LCEnK66mkjEmsaTT8f5BvTv1
-UKZkeS4UYw3wLzi7zSQA/3TzGPWU1DDdRsvCNBiyQMtApsHn1SMw5YmBQgQrSXrg
-=qjUp
+iF4EAREIAAYFAlKNtwQACgkQiIP6VqMIqNdpnQD/atvPJJlJgs1LxMUPhG7R1v77
+/nYGMsEEaH7LE8XZxs8A/AkRCGHIYXuIqW5L050dWfdtg/UrWNOZapqnl0KRoLc9
+=pcSU
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/sinatra/files/sinatra-1.4.4-fix-tests.patch b/dev-ruby/sinatra/files/sinatra-1.4.4-fix-tests.patch
new file mode 100644
index 000000000000..25ed73097bf6
--- /dev/null
+++ b/dev-ruby/sinatra/files/sinatra-1.4.4-fix-tests.patch
@@ -0,0 +1,25 @@
+commit c5c9f6b5501a366d5809faa44e50fad371c14870
+Author: Jon Rowe <hello@jonrowe.co.uk>
+Date:   Tue Oct 29 14:18:46 2013 +1100
+
+    fixes the build by disabling path traversal protection for this test
+    
+    Seems that this test is in direct competition with the desired
+    behaviour of path traversal protection.
+
+diff --git a/test/routing_test.rb b/test/routing_test.rb
+index 410bfda..5584601 100644
+--- a/test/routing_test.rb
++++ b/test/routing_test.rb
+@@ -90,7 +90,10 @@ class RoutingTest < Test::Unit::TestCase
+   end
+ 
+   it "it handles encoded slashes correctly" do
+-    mock_app { get("/:a") { |a| a } }
++    mock_app {
++      set :protection, :except => :path_traversal
++      get("/:a") { |a| a }
++    }
+     get '/foo%2Fbar'
+     assert_equal 200, status
+     assert_body "foo/bar"
diff --git a/dev-ruby/sinatra/sinatra-1.4.4.ebuild b/dev-ruby/sinatra/sinatra-1.4.4.ebuild
new file mode 100644
index 000000000000..7e2796527b06
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-1.4.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sinatra/sinatra-1.4.4.ebuild,v 1.1 2013/11/21 07:32:19 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md 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 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_PATCHES=( "${P}"-fix-tests.patch )
+
+ruby_add_rdepend "=dev-ruby/rack-1* >=dev-ruby/rack-1.4
+	>=dev-ruby/rack-protection-1.4:1
+	=dev-ruby/tilt-1* >=dev-ruby/tilt-1.3.4"
+ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder )"
+
+# haml tests are optional and not yet marked for ruby20.
+USE_RUBY="ruby18 ruby19" ruby_add_bdepend "test? ( >=dev-ruby/haml-3.0 )"
+
+all_ruby_prepare() {
+	# Remove slim tests since only version 1.x is supported and we only
+	# have version 2.x
+	rm test/slim_test.rb || die
+
+	# Remove markdown tests since these fail due to encoding issues. Not
+	# clear where the actual problem is.
+	rm test/markdown_test.rb || die
+
+	# Remove implicit build dependency on git.
+	sed -i -e '/\(s.files\|s.test_files\|s.extra_rdoc_files\)/d' sinatra.gemspec || die
+}