From: Hans de Graaff Date: Sat, 17 Dec 2011 14:53:47 +0000 (+0000) Subject: Avoid broken specs for ruby19. These appear to be related to changes in newer ruby19... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=75a6fd19525fafa74b9ddc2db4c6a7c1bf9ada4c;p=gentoo.git Avoid broken specs for ruby19. These appear to be related to changes in newer ruby19 versions. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog index e250f5b39421..3739838ed0ae 100644 --- a/dev-ruby/rack/ChangeLog +++ b/dev-ruby/rack/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ruby/rack # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.62 2011/12/05 13:30:55 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.63 2011/12/17 14:53:47 graaff Exp $ + + 17 Dec 2011; Hans de Graaff rack-1.2.4-r1.ebuild: + Avoid broken specs for ruby19. These appear to be related to changes in newer + ruby19 versions. 05 Dec 2011; Naohiro Aota rack-1.1.2.ebuild: Add ~x86-fbsd. diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest index 964b2bbc347d..c59cd9cc6bdf 100644 --- a/dev-ruby/rack/Manifest +++ b/dev-ruby/rack/Manifest @@ -14,24 +14,14 @@ EBUILD rack-1.1.0-r1.ebuild 1343 RMD160 ce8015fec934f9df85f25c25b9584b291db5cafc EBUILD rack-1.1.0.ebuild 1282 RMD160 2507782d9e4b2e5c22da84bbdb7d521edcff62c2 SHA1 43a5861afa0903d111be7d493cfe31f5ce915092 SHA256 172f2a9d15660e4cc8b1ebbddb9a38abfc3d7d20a306fe3a3d00a944b234af05 EBUILD rack-1.1.2.ebuild 1356 RMD160 cf3e1890672a776cec3ac66ef2eb2fd09fb865f0 SHA1 4af7aab8c68e9d92e05a092d254d8f11aa7e0cad SHA256 0e0672e3a351f0c11326fecc06ed54546af4ae8db996aa40ef1ffe16cccfebd2 EBUILD rack-1.2.3.ebuild 1690 RMD160 751f206621da2567bd544b9179d158401d90d68a SHA1 1190349f20f6c29d3fc6a37c1dbfba220bf5bd5e SHA256 84d6c4334ad99929e4e6ec04eeee162a5af6a6e5cb87c78921c6386ac2c57151 -EBUILD rack-1.2.4-r1.ebuild 1855 RMD160 8dedb015a6930637ac77714479d76305fcf4a446 SHA1 95cf9f86127d6c89690c58ffdaa43870510d1cb5 SHA256 e28e3a02904fcdb501364fcb684696eeb5753150edc103edce464f565443d422 +EBUILD rack-1.2.4-r1.ebuild 2439 RMD160 d714e74f1310f47f5bd9d24d73f6ed724140d9ac SHA1 02e9b52a3c6894457884f92792d599cf890ad602 SHA256 3f62b11636c4f360c2f24a2917a1201ad1e2031491f322e5f56699740a03b2b5 EBUILD rack-1.2.4.ebuild 1683 RMD160 3daff284889b0aade46b7a560cdf348bf96b3b58 SHA1 43290d2990f329e01382a61afd561d3a1551d631 SHA256 337f4222b895826d28ace7bc511916a8015e06593a3b9303ec55fa55b2e4c173 -MISC ChangeLog 8031 RMD160 b24b8f33e011a5a50183dc7ed382a30b3410c517 SHA1 904ab7fe43deb3fb39fe55bbe896ec87074abddb SHA256 c728d750e0cef40efbc297ef6116fb5a8dd9cf3f71184141a70f79877a759c26 +MISC ChangeLog 8204 RMD160 8865174b51e37716424220adfcdc90d241d9698e SHA1 d12248e158008ce8973997e44d8f7d15ac157547 SHA256 2565d4e030393779e3646b57447e535e672cd2bd493b1eb18a2404bac864b36e MISC metadata.xml 298 RMD160 346a19f2ad30420333de0e18f6885d39c45199f9 SHA1 aa0efe5a5420481faf50930f7e9934fdce3f15f3 SHA256 4433420c9bacb25a180e376175271d9fa41ab158ac71638fb8cccc460370899b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCAAGBQJO3MeQAAoJEDYO1FT4VRUU/sQQAIJvylrU+d3quoVAFOLVlLJL -uumeyQ/P3NxHuvSZ4ktmgYg4oMz6QyPT/oo6fsxymxtD5hPhOBFij44PUG4U6onN -Hai7PR9mZhZYzftLcrYEWlJIkw7aP/ynQoV80AA9MuKoqeCg/yDJhSfy2yCNf3fN -zKzVBH1HVHivvRLLKXUhYyUe01dJu/QHyoHk8XqX33M/p0LTGfSVV71PjqIQfOuM -iRonkbt4lyr6gy9yrcBTln2wpJwwkro2Cp71jMYins34EgjM3gfO2cY+PAm9/TBY -Ii21xMGsBKVmpaUmna3OjodsCjoxaSEOh3eIkIXRjggEiX6dAtlqcO0LNs1L5vQt -nDBvRPiC74CqrL8yv1yvw7IFHXVdTIDVUuvSvibQHn/l91GZGKr7P5U4acim/rls -GMJQdwlhzocNH5Ze2ed/naaEuGNrnO7BuKavVpo+88wTBzawMuggGq4MvtNMeDEq -XKeMer+Ecv8/izWwHFj72QoGFJL04TvdCySGj1bAQ1p+wCOZEKJ4eHB1S0qoWqjP -RIFekZDrr6U6+9AIiU00weoeAvljglhtPLBKK+cJSFHXCNaVVAGsZT35XBBFQ77O -Rjiw3/vh40yWRazR4kfAG7ZSdRSWG/eewIh5IdCbgcE45VxFSxb3igiNTdhxGjOp -N24xdzJYAw1UuIhvTQPi -=JT07 +iF4EAREIAAYFAk7srSEACgkQiIP6VqMIqNfJ3wD/Q/4Mu4Lgt3HSAdqEJd1c3zfA +wQfJn7QhO5FldkXkhsYA/0TyG8vC6pgf6daoDbnysBIlJE1GYTKV3JrZieC8vRn8 +=T7+Z -----END PGP SIGNATURE----- diff --git a/dev-ruby/rack/rack-1.2.4-r1.ebuild b/dev-ruby/rack/rack-1.2.4-r1.ebuild index c8037cb14c2a..791b5f108b92 100644 --- a/dev-ruby/rack/rack-1.2.4-r1.ebuild +++ b/dev-ruby/rack/rack-1.2.4-r1.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/rack-1.2.4-r1.ebuild,v 1.2 2011/12/05 00:02:44 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.4-r1.ebuild,v 1.3 2011/12/17 14:53:47 graaff Exp $ EAPI="2" USE_RUBY="ruby18 ree18 ruby19 jruby" @@ -41,6 +41,22 @@ all_ruby_prepare() { sed -i -e '1 irequire "thread"' lib/rack/lock.rb || die } +each_ruby_prepare() { + case ${RUBY} in + *ruby19) + # Avoid failing encoding-related specs, most likely due to + # changes in handling of encodings in newer ruby 19 + # versions. + sed -i -e '/escape non-UTF8 strings/,/end/ s:^:#:' test/spec_utils.rb || die + sed -i -e '/escape html entities in unicode strings/,/end/ s:^:#:' test/spec_utils.rb || die + sed -i -e '/escape html entities even on MRI/,/^ end/ s:^:#:' test/spec_utils.rb || die + sed -i -e '/accept params and build multipart encoded params/,/^ end/ s:^:#:' test/spec_mock.rb || die + ;; + *) + ;; + esac +} + each_ruby_test() { # Since the Rakefile calls specrb directly rather than loading it, we # cannot use it to launch the tests or only the currently-selected