Fix dependency issues reported in bug 543102.

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

4 files changed, 19 insertions, 13 deletions

diff --git a/dev-util/cucumber/ChangeLog b/dev-util/cucumber/ChangeLog
index ad3992971d0e..9b2343d902b3 100644
--- a/dev-util/cucumber/ChangeLog
+++ b/dev-util/cucumber/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cucumber
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/ChangeLog,v 1.91 2015/03/08 14:43:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/ChangeLog,v 1.92 2015/03/13 06:47:40 graaff Exp $
+
+  13 Mar 2015; Hans de Graaff <graaff@gentoo.org> cucumber-1.3.17.ebuild,
+  cucumber-1.3.18.ebuild:
+  Fix dependency issues reported in bug 543102.
 
   08 Mar 2015; Hans de Graaff <graaff@gentoo.org> cucumber-1.3.17.ebuild:
   Drop ruby21 to create stable candidate.
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index c9aee25438dd..f9b9d12af7d0 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -6,14 +6,14 @@ DIST cucumber-1.2.1.gem 333312 SHA256 11df76fb89c90fd37493560879dbd284665320fbfe
 DIST cucumber-1.3.17.gem 278528 SHA256 3d6029398314ebbbba899c0739e5777ca317cc02353c8a8bfe7510c772ef56be SHA512 85d36ea77df50b2e3ee0e53d92ac8134d45a620b0b8ddddd1625204a051986136039adf21d1d78e78be325441613aabaa4dfc0f951c69a04e36767e3ae9bc40f WHIRLPOOL 8a87e8b7562a9245c29082dc72da2aace9a51150e982750d7db8749fd3c8a168ee67a8f803b02ce84e5424a4a59a86e43e8f7814b177256cbe519735e65df312
 DIST cucumber-1.3.18.gem 278528 SHA256 bc21947eb2566020c1fb8630d48a03e8275e7516ae16ebf5a08bd9078ed5709c SHA512 8279f4394e5205f3e7fef850ab746206c13241343399f4d0960dcde6288c00a45942f112e87a3a86ab7a1d0d331bc8024c0304be39fb4b63a8b4b3ea509a0504 WHIRLPOOL 4623cc8d0648a995dbeb3d888cf41dda5871cde68891cb936cd1778eca65764a44b4d15b29a14dc142d1647d500be174eec65eaa7303dd6ec1da042b3d241797
 EBUILD cucumber-1.2.1.ebuild 1920 SHA256 26615581f80ecc4b26d30f427b081fed192fdc88e9945e9d888d4acde2b32390 SHA512 1e7f9c6a77fe8f7b374163e5fb490394b254ba25b435e3d6bf70c2a3aaa5561bba77a7ff2e6ca198f020d9e4a3f6566ac739996fa16c8b72d2b31c5e1d7717c4 WHIRLPOOL a44decbe28d29d0f0b6d0994b99d8e8236ce57b77c55e9528aeb74251487ce4ed70b6500bea21132d73eb8aa9202bba59add0f77997be384111884d24aba7f0d
-EBUILD cucumber-1.3.17.ebuild 2117 SHA256 fe7143d12df0d35c438b6dad98ec535ae1607ae59eebe71259d072c9341586f2 SHA512 40b7b52eae15440f6902b0e55a265773ebe4d22ab2dc26e2f151e8ac14e9c2c3f419a3733c26fa51e165fad094ddd51a9b1a1c2a32da726acfcc2787e23758f8 WHIRLPOOL a920d859af0a20b6f927848a064165225bc94a02adc4531a1ad9e6dcc30110875a5e4bbb2f15cb7b0c863ecfad1bfd251520fbb9a2e9ce262f75c0c168cc807c
-EBUILD cucumber-1.3.18.ebuild 2237 SHA256 56ad6bcfcb9e6ad04493aeffca162c42bfe99042f49cd04d4b085008c2d13d26 SHA512 f176eb043f47bc6485a581a913964f0ef02d57ab0f89c5bde118b1b13a1a582d1873ab42bb70d60cf0c0f4ed420e2947d78016255c587ab1408cf13cc34311b5 WHIRLPOOL 4520955283d29186fe6394e8b075ebd0cc36a0799968246ed45c1bbd59fda53439d2a602a691119f7c773ddf906d1115c70b709846b321b54fc47dad2b0be3b4
-MISC ChangeLog 12790 SHA256 f4bf1b6577defe5bccec65449b2738f1d251c76ce9b0b2673ed523f2ce00476e SHA512 3cd4798c306735d7aa29d96cad2a31f0fdb99532b8e1c460daf5727a80e0d13128337d72c63f0a90aa390fd35ee3b339aff4660d5d6f609885fc223262967a4a WHIRLPOOL 730d6c809af02c1c3fb2f8422bd6c4e805aaa2e0be3ce2228d88226963d0a56650cd669b81ddb93a6941d9295963724523ae41fea9e000071a25b7d590cc0bff
+EBUILD cucumber-1.3.17.ebuild 2189 SHA256 e72a920ac5f5339108fb0acb408ac0cc39b8168fcc3b84fe51b8c7a0256607b7 SHA512 00a1f74be29f494b97164970a29d9afb0ea14b58bc4d473f49c2e4b630bf41973e144590935eee027f89a7d20403b47750435333829bf3c3c21bb3fadfee38ee WHIRLPOOL 272fc13d5a4426685d21eb712060a488ae2fe55fe63b82a7fccf238453a8d451863d695413a313859cc0b790983de4ca4944a3516d503551a90804b8d6c766e1
+EBUILD cucumber-1.3.18.ebuild 2309 SHA256 4a5b3d8ec0b9af67a0b3a4923c20f947e688e12cf2a2d11ea1b20d8d6ff311bc SHA512 3da3a0bbedae1f184759a835c3aecbd97530452a14a642855953b47b50ae0ccd01b5b439548b021a3e79dce2b33bc11da635aaf22bd7d7c26228ce7316e4a3d3 WHIRLPOOL 0ae4c3b322fcf8888e69bd2f405187220e1131642f08d80b4afd4924371ceb35f7a93c425b085ee16552e3ad5605b11d81937d4c964d3b2ab19ff525a00785c0
+MISC ChangeLog 12939 SHA256 96b0c15c0261d2ed0552be450087bcefbaf1e19757b0f49627a9a74b1111ea89 SHA512 9e5a66d1fa36da06f46c393c9112c9871bc9f650c7cf1f338d6a9c54b3e6c4a82f034f802a49bbc76eb6daa56e960ce7e5863d97cca2ab908f0692d8f9de458c WHIRLPOOL 393bc74b1cc031caff157bf42429b911279cc8817f41e80c6c578cfef592ff4ae36657823db0812d6be8773d50654f6f904cf346eb9b6e51dfbb0647e0b035a8
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlT8YB8ACgkQiIP6VqMIqNdmJQD8D9TSMibBXvgyVx78oh8x5+I6
-O/329b9a/rje97C5TOgA/1q0xP257nd2NEqps8kuuEzitYVQwcmFzOhDVUQ4r8Ve
-=Wm29
+iF4EAREIAAYFAlUCiA0ACgkQiIP6VqMIqNfwiQD/aWgh+y79Gh70S96dGRy71A0i
+60e3cgZBnxkfvTffM4EA/jwSD/a/MsCHP/CRWnrcMv05EzVCUIhHSo3o4BlFx5cT
+=/DMx
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cucumber/cucumber-1.3.17.ebuild b/dev-util/cucumber/cucumber-1.3.17.ebuild
index 91b440589e95..522e2a4b2f24 100644
--- a/dev-util/cucumber/cucumber-1.3.17.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.17.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-util/cucumber/cucumber-1.3.17.ebuild,v 1.3 2015/03/08 14:43:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.3.17.ebuild,v 1.4 2015/03/13 06:47:40 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -45,15 +45,16 @@ ruby_add_rdepend "
 all_ruby_prepare() {
 	# Remove development dependencies from the gemspec that we don't
 	# need or can't satisfy.
-	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Fix too-strict test dependencies
 	sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
 		-e '/aruba/ s/= 0.5.2/~> 0.5/' \
-		-e '/rake/ s/10.2/10.4/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+		-e '/rake/ s/10.2/10.5/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Make sure spork is run in the right interpreter
 	sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
+	rm features/drb_server_integration.feature || die
 
 	# Avoid json, they most likely fail due to multi_json weirdness.
 	rm features/json_formatter.feature || die
diff --git a/dev-util/cucumber/cucumber-1.3.18.ebuild b/dev-util/cucumber/cucumber-1.3.18.ebuild
index 9878720e5a30..270c040762e0 100644
--- a/dev-util/cucumber/cucumber-1.3.18.ebuild
+++ b/dev-util/cucumber/cucumber-1.3.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.3.18.ebuild,v 1.1 2014/12/28 08:19:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber/cucumber-1.3.18.ebuild,v 1.2 2015/03/13 06:47:40 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -45,7 +45,7 @@ ruby_add_rdepend "
 all_ruby_prepare() {
 	# Remove development dependencies from the gemspec that we don't
 	# need or can't satisfy.
-	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Fix too-strict test dependencies
 	sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
@@ -54,6 +54,7 @@ all_ruby_prepare() {
 
 	# Make sure spork is run in the right interpreter
 	sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
+	rm features/drb_server_integration.feature || die
 
 	# Avoid json, they most likely fail due to multi_json weirdness.
 	rm features/json_formatter.feature || die