summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-08-14 09:40:48 +0000
committerHans de Graaff <graaff@gentoo.org>2011-08-14 09:40:48 +0000
commitc4113ce88d5cd1a99bb61f153de9f05e0893a2e8 (patch)
tree57ac9e23e36f04db8e4fe5b95e49c4df27b04476 /dev-ruby
parentversion bump (diff)
downloadhistorical-c4113ce88d5cd1a99bb61f153de9f05e0893a2e8.tar.gz
historical-c4113ce88d5cd1a99bb61f153de9f05e0893a2e8.tar.bz2
historical-c4113ce88d5cd1a99bb61f153de9f05e0893a2e8.zip
Fix specs with newer versions of Sinatra, fixing bug 376179.
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/rack-test/ChangeLog5
-rw-r--r--dev-ruby/rack-test/Manifest12
-rw-r--r--dev-ruby/rack-test/rack-test-0.5.7.ebuild6
3 files changed, 14 insertions, 9 deletions
diff --git a/dev-ruby/rack-test/ChangeLog b/dev-ruby/rack-test/ChangeLog
index e57853cae472..6aad3df365d6 100644
--- a/dev-ruby/rack-test/ChangeLog
+++ b/dev-ruby/rack-test/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/rack-test
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-test/ChangeLog,v 1.15 2011/08/07 14:48:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-test/ChangeLog,v 1.16 2011/08/14 09:40:48 graaff Exp $
+
+ 14 Aug 2011; Hans de Graaff <graaff@gentoo.org> rack-test-0.5.7.ebuild:
+ Fix specs with newer versions of Sinatra, fixing bug 376179.
07 Aug 2011; Raúl Porcel <armin76@gentoo.org> rack-test-0.5.7.ebuild:
Add ~ia64/~sparc wrt #351835
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index 92eacf0e7e9b..1d357efc1afb 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,18 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
DIST rack-test-0.5.7.gem 20992 RMD160 c053f010cad5972c9373cc66ca358676ceb45fa9 SHA1 09fd7cc10fc7dfca87cb139cbf939f82d26f0c2e SHA256 09d0ebd4ce3def65934b48fcbbcb2703476d379ee487b5cf085696363f5e7e88
DIST rack-test-0.6.0.gem 20992 RMD160 fdf246b51c4e10f2cf2b80fbb5864789ada3da67 SHA1 7b010a5aa27b637819104ea9782c3e76a5b59839 SHA256 73db265decd421dfab4ac02443e2ff8aaf86a10e28c8cbb36b132bdd31a5e1b7
DIST rack-test-0.6.1.gem 21504 RMD160 e6895457f477746a20ae42fb4fa632aebeacbc4b SHA1 793326ad14fac5369f623064a5a13e9953a6bf3a SHA256 40731078f570c61d5fc5a57ddc3526ac08f083a0601e99ffd7672d281dc20543
-EBUILD rack-test-0.5.7.ebuild 939 RMD160 246310da7217f8ac5fd0ca8b5e2afd6884319632 SHA1 0632f93cedc311887dd2e2e7124152b3ca2a109a SHA256 0f9a3925d0143913adf32e61887b4c572786c6d72aeaacf4faf4746bcdfbca6e
+EBUILD rack-test-0.5.7.ebuild 1027 RMD160 3816c66d4654f3796fe3b808a43deaadf63b300d SHA1 6992e10b301a349977374710a44a769d65153d97 SHA256 b494faa4f64a9f231de5eca803fb07afc389ff751f410ed9c7dae52822bc2983
EBUILD rack-test-0.6.0.ebuild 908 RMD160 9b7a1f3fe987fca9b0e74e1f69c88e7c4e6e7506 SHA1 175a6ec1f273a39a89cc23be6db2939b35624bc5 SHA256 f9e24d995603b740b4820cd09748f8cf1acd093bd7a26bf59a763eb7b2f22f65
EBUILD rack-test-0.6.1.ebuild 908 RMD160 9658ee6d056fa7c1c33cd4530f652edd29b09cae SHA1 5b5ad2e792e878a04255c9249559459136c37c76 SHA256 ee97e43e08965ae7ca9c8029070e97b58301e4e3f437bc50547de28c865c07a6
-MISC ChangeLog 2113 RMD160 ab86d4d0573ea5060b68d26117d3fe626494b733 SHA1 6d644b98bd62bd2153c5335c8ebc3490838378b3 SHA256 7a59efed488a4d30dd9039d7a70691f1ff9c0d3c84446349aadcf754c5246053
+MISC ChangeLog 2250 RMD160 fa64c5e78d7bacb94092b86952bfb3e80f66656d SHA1 0b950c4f635827c748f727b6a3d8579daad7646e SHA256 0755d398c4cf8aedd011e2f920a288e1d911213466d965f7f1f671931ed6e05b
MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk4+paoACgkQuQc30/atMkAA6gCgwiF/fjMsZZ2zjTn1hwgUJRk9
-tcwAnRC4SmnxuGUNNR6ZyJbt0+Xio2U4
-=c2tp
+iF4EAREIAAYFAk5HmCsACgkQiIP6VqMIqNeKgwD/e50Pjp5bxr9mg8v+oRsKzHZi
+o6SVuGsNfZWyi+oNU9QA/3DnZI8Fyeu8Obhjr0ItpYIsWHpX6PjR2LisCU9trh1N
+=po+3
-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rack-test/rack-test-0.5.7.ebuild b/dev-ruby/rack-test/rack-test-0.5.7.ebuild
index e8cc319b5b17..64a33ff3793d 100644
--- a/dev-ruby/rack-test/rack-test-0.5.7.ebuild
+++ b/dev-ruby/rack-test/rack-test-0.5.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-test/rack-test-0.5.7.ebuild,v 1.5 2011/08/07 14:48:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-test/rack-test-0.5.7.ebuild,v 1.6 2011/08/14 09:40:48 graaff Exp $
EAPI=2
USE_RUBY="ruby18 ree18"
@@ -23,9 +23,11 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
IUSE=""
ruby_add_rdepend '>=dev-ruby/rack-1.0'
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/sinatra )"
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 >=dev-ruby/sinatra-1.2.0 )"
all_ruby_prepare() {
# Remove Bundler related code.
rm Gemfile Gemfile.lock || die "Unable to clean unneeded Bundler items."
+
+ sed -i -e 's:== "text/html":=~ /^text\\\/html/:' spec/rack/test_spec.rb || die
}