From 8cf303f0df9f9bff9d82e4cf3beb19d1f7166d6a Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 3 May 2015 08:02:26 +0000 Subject: [PATCH] Avoid test know to fail and possible crash ruby, fixing bug 438412. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7! --- dev-ruby/ferret/ChangeLog | 5 ++++- dev-ruby/ferret/Manifest | 14 ++++++++++++-- dev-ruby/ferret/ferret-0.11.8.6.ebuild | 7 ++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dev-ruby/ferret/ChangeLog b/dev-ruby/ferret/ChangeLog index c52e6ce02e97..3cc292c3aa21 100644 --- a/dev-ruby/ferret/ChangeLog +++ b/dev-ruby/ferret/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-ruby/ferret # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ferret/ChangeLog,v 1.10 2015/02/21 04:52:48 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ferret/ChangeLog,v 1.11 2015/05/03 08:02:25 graaff Exp $ + + 03 May 2015; Hans de Graaff ferret-0.11.8.6.ebuild: + Avoid test know to fail and possible crash ruby, fixing bug 438412. *ferret-0.11.8.6 (21 Feb 2015) diff --git a/dev-ruby/ferret/Manifest b/dev-ruby/ferret/Manifest index e75be7efccb9..4c13c2ff7e47 100644 --- a/dev-ruby/ferret/Manifest +++ b/dev-ruby/ferret/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST ferret-0.11.8.5.gem 627712 SHA256 cc925797c7f85fe55ec86e511b27ec36f3b842e2bdcd89ebbc8e7c90cb1e515b SHA512 3478784437d7787517f3c928485f507ee90e78bb8e7155714798b83bc0e29996275e6e55f6fcc245777d1ec49eee421b048ddda3089ef7602c7fe2dc62e91c49 WHIRLPOOL 57ef977105948fe09dd8417394947462b82941299d979b76ce4f9043548f4ca781f898580cb27feaabc365b5552f5e8c4043f3fef8b03cbd88b6891864b82bcd DIST ferret-0.11.8.6.gem 617984 SHA256 c1d1bc3fe18d0496f02d11c925683c87ab994fd6e096b3ebac1652e3514e6d6e SHA512 bc545dc86abf7e818791f4f280025fd0a6ca3aad66fc4f4c6a532e995d718ee4adcdace15538cd35e068887ade059c874d8b6d72f5b02f98829d6db44b019c59 WHIRLPOOL ca148404fe29a3cf8b2e550ef73aa99dcf32654cb060f2e3d0c378e995733f8a4dadcd6f7bad6597c398caba39e06d9db0b6292ac87c23f0740f83a55da9d10c EBUILD ferret-0.11.8.5-r2.ebuild 1158 SHA256 1f06b9bf47e60584fa25bd1de075c0d2525f36c4efd441b34304aff0e5f4c93d SHA512 e38389dd87805bbdf9da57bd96b505f2e52213c17bb3d402781241cb31bc3ced53a13a1ffc36714c64a0274d03f7732b099a103e86d962b07e789b194392a58f WHIRLPOOL 4a54a183559883e15ee3604f07065bac9ebfef47f7ed81267161fb8da6d5ba4a206fd4256e1d80587c6eecf87996a52be498faab640770c6111b31cae9b3f88f -EBUILD ferret-0.11.8.6.ebuild 1161 SHA256 0b5912bf0eb8039bcfffceeeb8d082fddd443db33400c14eac0b52ea26df2cec SHA512 d95f913310ce61ceeb6fef11e15e9b5390b166855173f13f8253da4da4f639e2a0b4f175b285e0e4e0529f91302634ce9301e56c4d758d44810c2fb5f2c19b5f WHIRLPOOL a9e18e26c13dd9a34b27c3239f2dbc022ae6cbdbc88b4985d8ccfbd44d7bf5f34c67ce9d57d979092bcbebd7af4bbb79ab217ff56e2c25af13ed4f6a66d3735f -MISC ChangeLog 2669 SHA256 a614f09668b6346636e1dfaf9b4afb06f639338c33daeb6e70fd85af7ba9d72e SHA512 60a79ecf5601007fc9b8714f05e56aa7809720926e8d1f8bbb91dbc722bd52930a774bb03a8b1a0cca109bf6385130a500bc2a48d4e5cda0bc377f0ba8746cb7 WHIRLPOOL 01fe0b6f0b1ddb57875f6b7040e68857eddcc1a3df847f4f5b09e6f32ea32a75011f8f3395b1449e630a84cd4945efa54f88757d6f48ea6460218fb4215775d0 +EBUILD ferret-0.11.8.6.ebuild 1346 SHA256 54204a45fd8a2403049d7f7720492c062e3e356b123a6df594d18e90dee6dd7e SHA512 7eccb04d738574cc72d27cf8c8c9d89df23846cd53cb0e9bb92e29730e756d55207cf3dee73a5ddcca12a5d6dbc29e5011699e58ffe567e77c43ce9f12c39fec WHIRLPOOL b535640610d5c2536b3d527d8cde4efe20653bf232b53ae4de3ad2d569dadee666aa5a751c11f8f78da1b76f452aabbb706f7cc76e7f0ef49c5a23b16eae43af +MISC ChangeLog 2815 SHA256 4cc586634ca947f4f47c79b7e5e4fda49bb9c39fd4cd4ecbee6b72d6c58319bc SHA512 d1a7754159678816ca2c204fabaf73eab97fcb2ae17ffbc528c27051e49b97f979b9c3b5f7d0eeec3c2a12d6f361792c088afc63cd7074f1aac28f97a1052f29 WHIRLPOOL a4826cb8c30ab012823a3e74bb0d3dd5c0b9f59ad4f7fd13278517e3337ef2bb01306a32ed043f3fd4950e57ae6bb1d7ec942d4badddd99fe2d691b9bee5fcd4 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iF4EAREIAAYFAlVF1hIACgkQiIP6VqMIqNdnFwEAjreORYFnw7haghd1umhRC/Fl +8dxZRx03RU1LhsHMIh0BAIrsraCv0FDRSQpIccD+hRc+JUMPSzh78tBNKnr+o91G +=fjrm +-----END PGP SIGNATURE----- diff --git a/dev-ruby/ferret/ferret-0.11.8.6.ebuild b/dev-ruby/ferret/ferret-0.11.8.6.ebuild index b6dd485d1468..bef0302934b7 100644 --- a/dev-ruby/ferret/ferret-0.11.8.6.ebuild +++ b/dev-ruby/ferret/ferret-0.11.8.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ferret/ferret-0.11.8.6.ebuild,v 1.1 2015/02/21 04:52:48 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ferret/ferret-0.11.8.6.ebuild,v 1.2 2015/05/03 08:02:25 graaff Exp $ EAPI=5 @@ -32,6 +32,11 @@ all_ruby_prepare() { # Remove bundled bzlib code and use system version instead. rm ext/BZLIB* ext/bzlib* || die sed -i -e '14i $LDFLAGS += " -lbz2 "' ext/extconf.rb || die + + # Avoid test known to fail upstream: + # https://github.com/jkraemer/ferret/issues/2 + sed -i -e '/test_adding_long_url/,/^ end/ s:^:#:' \ + test/unit/index/tc_index_writer.rb || die } each_ruby_configure() { -- 2.26.2