From 27ccd87bfdd6df069f0dd291b46d12632acd1a58 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Wed, 4 Jul 2012 06:25:53 +0000 Subject: Avoid a test failure due to hash ordering differences, fixing bug 424667. Package-Manager: portage-2.1.10.65/cvs/Linux x86_64 --- dev-ruby/awesome_print/ChangeLog | 5 ++++- dev-ruby/awesome_print/Manifest | 22 ++++++---------------- dev-ruby/awesome_print/awesome_print-1.0.1.ebuild | 7 ++++++- 3 files changed, 16 insertions(+), 18 deletions(-) (limited to 'dev-ruby') diff --git a/dev-ruby/awesome_print/ChangeLog b/dev-ruby/awesome_print/ChangeLog index 2ee831961591..50aa9363ef94 100644 --- a/dev-ruby/awesome_print/ChangeLog +++ b/dev-ruby/awesome_print/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/awesome_print # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/awesome_print/ChangeLog,v 1.9 2012/03/08 01:18:00 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/awesome_print/ChangeLog,v 1.10 2012/07/04 06:25:53 graaff Exp $ + + 04 Jul 2012; Hans de Graaff awesome_print-1.0.1.ebuild: + Avoid a test failure due to hash ordering differences, fixing bug 424667. 08 Mar 2012; Naohiro Aota awesome_print-1.0.1.ebuild: Add ~x86-fbsd. diff --git a/dev-ruby/awesome_print/Manifest b/dev-ruby/awesome_print/Manifest index f745553ab8c7..13d9de0aea56 100644 --- a/dev-ruby/awesome_print/Manifest +++ b/dev-ruby/awesome_print/Manifest @@ -2,23 +2,13 @@ Hash: SHA256 DIST awesome_print-1.0.1.gem 23552 RMD160 b2b48fa1b97b4a076bb171926785a50199eb4e57 SHA1 ca6b72b475dfba363ad61001a560995c2b0d1b59 SHA256 355f4d95375080b8c762c2129b55d7b5c25d269d5c9f47249b091a350aa2cb27 -EBUILD awesome_print-1.0.1.ebuild 722 RMD160 eec14dadad369b0d2b47a9cf9b8a45e7f8b3ede6 SHA1 d18d508f1c17818e208d975354f3bfdd133e78bb SHA256 6066f779e2b74678364e917d47a9da931ff32f565d8f34fd57f98dd7d7d8c78d -MISC ChangeLog 1430 RMD160 ebb898450e9b97a576e5dc64094fabb7ebd8f9c6 SHA1 45f1cf1c486d69949ae2c0d6f18a4d6d3021dbf5 SHA256 758c52b5374991142278dcf9788521f93be99c2ad4b4dece8c00878dbed2c5f5 +EBUILD awesome_print-1.0.1.ebuild 893 RMD160 a6699c2b695b68b58bd26e352b1ec4243f006e34 SHA1 a76db09ee29e727ba5cee8c362fb8d52b3caf052 SHA256 e0c6f239a59f0a79dacdd25609c4064c369900b70386f2bab9914496fd936978 +MISC ChangeLog 1587 RMD160 795445293aa50f4acfe446f937826c27813cc17b SHA1 62e1f99308b84ef24ac09f534894fcca66cb4ab7 SHA256 89039d55d2b1a7cfb592e7cb5d706f53fae132d70a0e90e3fd2d286fd5443a52 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJPWAi3AAoJEDYO1FT4VRUUFUcP/1JCp7ERxcIFsWzGYHujrDXZ -iMs+IWrpV2X+b4aoA6MVfNucoO93+BN5SlTLeNmRqdy4rBH8OoV4OU40qtxA7p9w -uds7hlOFuWKQYXyLAol47H0SDJxUaUbB0LIVmKF4ijf44B6TBIxWo8OVxWSDJjep -QmGMR8v3Kt/FQ6ixKBbezin0eEY1rd7hIwTPaS0JMgfdryBnTarUi2Kl12ILNgJN -0MycA5mHVHAqvix3B1WOykU8yyamIO8/qL/Hbsnh/wLEBAMrHJocbIJ9v4Gkbn9F -0S4/IcD4xhRxTmd2oBvql8364s+wkGl3fF66kg1/wpj/3MolbK6FWWlwD4usuW4c -iuUyVpLWbqW/GdYFAc7+eOlLkIzCiIOnBDMV7HR0UiHVb0vjavwiBMygyxABv80R -ZKH41HXZkpBPHrrk3mPPPwYFQsAY71MxuFGvkB09UvLIOZrOD3TPL+VYHE2E/WLx -p5V2SOK9fQ+u+viBLnawXdkczeNQKVxcADz/H7eN5yRm99YzPulYnixbnnWXFYUT -bNRHWnwwilYD/HkA1qCg9WL75X1jblJQpQiAl1WzMCWkUKUuVDVY3vB3oOj7ypY8 -tVAp5ZLZWaoRThfMBWGRwWuOqmotv6iGpNDe5hWHAow4vNYfMpoBDttazHSLsEZ5 -FGy29PHbFZ5KvJX9eLus -=b5Je +iF4EAREIAAYFAk/z4fwACgkQiIP6VqMIqNfpegD+M64W8l8ciQV8vCxGHuvlEGbb +bxYzE/e2MwBwZ0OoBF4A/2eDB7w2+xB5MDSchMdDMz8oD0G/cQvPxwIpP1ECpsnl +=bZ9d -----END PGP SIGNATURE----- diff --git a/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild b/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild index adcdbfe07399..b01b049405fc 100644 --- a/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild +++ b/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild,v 1.2 2012/03/08 01:18:00 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/awesome_print/awesome_print-1.0.1.ebuild,v 1.3 2012/07/04 06:25:53 graaff Exp $ EAPI=2 USE_RUBY="ruby18 ruby19 ree18 jruby" @@ -22,6 +22,11 @@ IUSE="" ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.5.0:2 )" +all_ruby_prepare() { + # Avoid intermittent hash-ordering test failure. + sed -i -e '/handle array grep when pattern contains/,/end/ s:^:#:' spec/formats_spec.rb || die +} + each_ruby_test() { ${RUBY} -S rspec spec || die } -- cgit v1.2.3-65-gdbad