Avoid test dependency on dev-util/cucumber.

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

diff --git a/dev-ruby/httparty/ChangeLog b/dev-ruby/httparty/ChangeLog
index 6306ea5b70aa696277a2e0192f622de30c489f72..42db59485ce7efcb5ee101a99b9de41bdb270fbb 100644 (file)
--- a/dev-ruby/httparty/ChangeLog
+++ b/dev-ruby/httparty/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/httparty
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httparty/ChangeLog,v 1.35 2015/04/13 18:30:55 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httparty/ChangeLog,v 1.36 2015/04/18 06:27:24 graaff Exp $
+
+  18 Apr 2015; Hans de Graaff <graaff@gentoo.org> httparty-0.13.3.ebuild:
+  Avoid test dependency on dev-util/cucumber.
 
   13 Apr 2015; Hans de Graaff <graaff@gentoo.org> httparty-0.13.1.ebuild:
   Create stable candidate.

diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index 3b677c8dfb997cb94bdb5d53e2221ffcbb987c5b..8a5a71b5a5db77c237992c4b779237098196eca6 100644 (file)
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST httparty-0.13.1.gem 72192 SHA256 d2b97f77e388cfa86d9f697dbdcd30ef600474e17f3c0a717e554e551a3fc92f SHA512 d5571aeb03c0035efe4b2b7fa441110278f834094d8e94745590b640ad6d01e846a666e925578cbecd53dc393931e3ee548400ee4e9ec641abd1eb5dc3fbde48 WHIRLPOOL e2fc952da3108a73372b28d3f53ea51d8bc49ed6b6727b9ec70a23f3dcc8ee581332a15449deaccb908d845434bc9ac4e967f1c0def1252769c29743c92d2109
 DIST httparty-0.13.3.gem 75776 SHA256 71d5b4f03bf5e16168a300c53286d3e3fb2c5caa9386f486d4fc78d7c02d8f38 SHA512 9a31a92504a795fa88064b8ab6b4b00666ba138b50e8bbb6cedf56d3073be990422acfa8781efc0dea274ca8a78ee902a86a777c0f7cbacaeea2713267acd76d WHIRLPOOL 12990ca45c939d2860878f8a859aa4bd1e37982e2dbcb77a50a9646232ab43602a21551c120115f94af60461ad2ab37ab0ab49e8cd40f61a7dd0ce13fbef325b
 EBUILD httparty-0.13.1.ebuild 1138 SHA256 869e1035b75174b53508871842ab5dba41aefded061042be68c1cea797c246a5 SHA512 5e962c734f17e80137c7ed59b44f9ebfaccf3b6def48a207cff2627cc8875059bd9f33e1d483a060ce82e0640a26a8bf3a8f08b81cbc0d2b4dfd0ee6d1d4942d WHIRLPOOL 6a6ff6e81318d684389c2e787f37e8deafa52eca99f987c479071f46060faea175ef7b2a53987f0f064991a42ce86e9e083906d1ed0ac7c4a47c667eb339abff
-EBUILD httparty-0.13.3.ebuild 1144 SHA256 6a9a4883827b8c81fbab35113fff90ba98139ea709a079f4d3a126adc91ffbe8 SHA512 e649de0a079f3e69439eccc6810de6e115fda8f694b3b81fd27be02c868b1c14910213b8371a7bee2a74c82fec3adeb98c3271086813df7298e13acf57a28c17 WHIRLPOOL a46f8acc7756f8515bad0937770f5c616c86434be07933cbd49f345c338f340df5c9a4981701e79d9fc5b43505928c9e9dff48cca7e28dd4a1e548284f0718c1
-MISC ChangeLog 4699 SHA256 4c86310d123fadbc979037fb962097fbdca3f695572caa57da18a7fa3de498f5 SHA512 0a11113de717124dce156565b5a17562f70c3f61265db6bd7ff512e89c109940d08fd5a065402d139469425717840cabf0cd088d39a7cd2a790d766e1a660c3e WHIRLPOOL fea49dd170dde25be4fe8127b2d28389ba205e448eb7654b336ac2c0f3c32707d21a1f995500c0d376c6192cefc93ff5adeaf2c4a53054cfd917026bb2e48baa
+EBUILD httparty-0.13.3.ebuild 1205 SHA256 d066b287fdcafba7397e93652fc4ff5061e2b04c40a0bf3389dea22184edad9c SHA512 d7af31b4505e66df3b40f8c0f0d60c5a6b4d7f4a8d89a4efe373e5e3c9850785c493afb6765268311381684846cd243a53da716e010c3e948cfb6b33fe8f126f WHIRLPOOL e2ce99357cb0f087bcda0708d5d6a6c713bcc9160f111da45892ac1db10de35833b44a8dbceea0bfccdb9548671e0829556ccc29412f69c37bc9bc4b3f2b3166
+MISC ChangeLog 4820 SHA256 5080f89065692ddf0346a2006221cddac892a07cd29d42e12aa02455de8dbe89 SHA512 8d3d251021a79d83963563ed59239387c7602d6407e15f17ae8ba56e3c2a5f974af11f4cebc8793d4b7ac9a5197cc3e84d0c3b4c965a06d7303ee3059470dc8a WHIRLPOOL aae8b62b0a40a88b1c01f2a2466741cafbb9bb4a328d7ed7ceea5707e8598d718620b4230c8ec7f9c9dc92a0edb8960cd394736d239aeee89625f4510786e3a7
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUsC2AACgkQiIP6VqMIqNfBPgD+LmVq7lMbp4C11zky5dNkyudn
-VNRlcdQgXt0oRMqppckA/1NDjcOfXjBInC+GdQUSOvaaXIjZRHLLxcNmhIcucPHk
-=JWjG
+iF4EAREIAAYFAlUx+U0ACgkQiIP6VqMIqNdgZgD+L/oFkSve727eR4CXtw9yxTaL
+pa6J0XqVI3Hz3TPMfDEA/2QALDqts4acO8TqZnaYGAJwt+io1v+qInEcKai6aDiY
+=2a1Q
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/httparty/httparty-0.13.3.ebuild b/dev-ruby/httparty/httparty-0.13.3.ebuild
index 36934ddc85b153f351167dce8811b7b976bdf5bb..2b2ff95856da4f6618e9c1f7a10e3e905078e139 100644 (file)
--- a/dev-ruby/httparty/httparty-0.13.3.ebuild
+++ b/dev-ruby/httparty/httparty-0.13.3.ebuild
@@ -1,10 +1,9 @@
-# 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-ruby/httparty/httparty-0.13.3.ebuild,v 1.1 2014/11/13 22:07:24 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/httparty/httparty-0.13.3.ebuild,v 1.2 2015/04/18 06:27:24 graaff Exp $
 
 EAPI=5
 
-# jruby → testsuite fails (seems like a testuite bug)
 USE_RUBY="ruby19 ruby20 ruby21"
 
 # We have a custom test function, but don't null this out so that the
@@ -33,7 +32,9 @@ all_ruby_prepare() {
        rm Gemfile || die
        sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
 
-#      sed -i -e '/git ls-files/ s:^:#:' ${PN}.gemspec || die
+       # Avoid test dependency on cucumber. We can't run the features since
+       # they depend on mongrel which is no longer packaged.
+       sed -i -e '/cucumber/I s:^:#:' Rakefile || die
 }
 
 each_ruby_test() {

diff --git a/dev-ruby/jeweler/ChangeLog b/dev-ruby/jeweler/ChangeLog
index e44027561c5aaa484f8d16d82f0964aa35dc73b9..b2b6f6cf2252c0188bda69c38fca9f9c1a74841e 100644 (file)
--- a/dev-ruby/jeweler/ChangeLog
+++ b/dev-ruby/jeweler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/jeweler
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/ChangeLog,v 1.32 2015/03/16 19:26:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/ChangeLog,v 1.33 2015/04/18 06:31:03 graaff Exp $
+
+  18 Apr 2015; Hans de Graaff <graaff@gentoo.org> jeweler-2.0.1-r1.ebuild:
+  Avoid test dependency on dev-util/cucumber.
 
   16 Mar 2015; Hans de Graaff <graaff@gentoo.org> -jeweler-1.8.6.ebuild,
   -jeweler-2.0.1.ebuild:

diff --git a/dev-ruby/jeweler/Manifest b/dev-ruby/jeweler/Manifest
index 77848566e8e6f7295fdf97dbd3542d84bb15df58..f94fc0f5092dfca4997bd66785fe38fe235d1043 100644 (file)
--- a/dev-ruby/jeweler/Manifest
+++ b/dev-ruby/jeweler/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 DIST jeweler-1.8.4.gem 57344 SHA256 54efd74d68f69898a1674dbb410e5c27a5f7311b264531736f2c736cb87e043d SHA512 14f8a6853cc5593834e270d274404e6a7bbcb4542ef12297449cb10a7d8394131fa56acee1b2592871f237ceb9ab3fe1432a908d2dfa04e39e91d9c99a3c800e WHIRLPOOL a0f245ce50ec2bb162c3d034db93b3493a6446f65ead537c3cbe8c4890c8b3d3c795e8f6ba9856fa0b474d1dea565d689e27576b58dabc61fedac8d24dbae2e5
 DIST jeweler-2.0.1.gem 58368 SHA256 2f8c325789f9bf63d273cb040eae2f9ac4271789e5587edbc2d4d22de5ec2882 SHA512 296f661b0e782353bcd166be04501b9f792a9edbc72bddb21c6322e99b0d1da6a03b9f31a19b9daa6d26e18cdbb37cfd7856c91f6befbb920b633fa22d81c41c WHIRLPOOL 9406b5453eb95f14df0696df241e84d54fd80512e6cf7f62bf230bb958ac0bfcb762a1d811ddb35ea9942788cfdc692b0430269e5d378653b24e3c5072b24e8e
 EBUILD jeweler-1.8.4.ebuild 1553 SHA256 d37aa0d225b9e74448e21f20df559edd3a7f26decf50e5afc143c538145ca158 SHA512 f989a392a2ab598424552ee36d993f94bb84b19ac7eba7c26ad14a27a6cf0e4daa548ad3bee8c1b5553a7623dcd9c32eb3763c537370d363190cb882e922581b WHIRLPOOL 959c22088b7dc2a96a0dfdfa31e9a64cf64db85eba747000b612c8267b648f76a7782401feb011e20e82825216e6cdaeff0ae7ef70410c2670ee7382bf67a104
-EBUILD jeweler-2.0.1-r1.ebuild 1677 SHA256 c961b1e73938814018047b3c72b8cc1d1a1187a45a571f821caf317ff666a620 SHA512 ff27bf8c297b41696c3b453d15a045c4f609a6a1904631821160c1ef4b9169b12082f954c56e3c026426951b2abffe75886d63b315f3e0f244295559d28fbe6c WHIRLPOOL f6aa079b18fd1e2a4386e47ffdcef830d3c0afa683388e8b6f942ad8d5545f1fbeec7454a5b97240d66dbcc38712d61e8815e851ca5ffb231e2bbca47afc2372
-MISC ChangeLog 4323 SHA256 0bf891433adcb88e47fd8901bd3a385ce9f20af1190cb8d5fee25f1693683834 SHA512 44a167cb8247e43cada2fa883e44cb120488acf7f8cfa46385f02eba529cce3551c8b72587fd1c79309461dd56028957803350f69589385176cb884262cc3616 WHIRLPOOL fe14da1cf8c4d027db82a009e0d1d2b33241f704a4332f03f029643080cf7753efa61abab3b5611857c6e8e09396eb4fed455e32d44bd598e674f5bbf8205156
+EBUILD jeweler-2.0.1-r1.ebuild 1762 SHA256 0b4b5223cc5e3783d9274ae384a4235394f45f92ee19745bf7b3e0a86b5eecad SHA512 9d11278f95798c6f5a73376d259959ada0f0504886dec2ad893914b8a328c8de9fdcaaa58b520ea28416cae958ac3f6be4b2a2ccc43795b9f4101e28cea8723b WHIRLPOOL 89ebcc2aae062e91ba94dc50e2162a9a394948bf464ca2c9c054b7bc2cc3c742c54b08693f1a434d88d55bc6f05a846abd81e8dc4917db5d7f3337855f7ff375
+MISC ChangeLog 4445 SHA256 c56802b16f62bea2b8536426f9209bccc1b725bee36dede67f592d7ec7241ce4 SHA512 8d5282292185741c2923d0af6601d57df63d51c3ef292ca84a40614fb0ceafadf89a194158e61587e8b06290b689f1d9f6ad5903ae803eca0721abe57caa0aef WHIRLPOOL 138980da735dfd781722d25cc7ee3965162f0bb3c9d5ef366541ca4af18f4c9208041e2afe2f752745aabf75f8ee696401d63ebe7c70fc04ebde32f754676f7d
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUHLoUACgkQiIP6VqMIqNfH6gD7B+EnpmbivOel28B2+0Qasnof
-2LDKOp4M5oug9Z4/PDoA/jugdoAdC9Fpej+A2EbQYmSMNbmzVI6t390HSz1QmUw5
-=mWXE
+iF4EAREIAAYFAlUx+igACgkQiIP6VqMIqNeVhwD+LhTe5/SdOmBFOTi5gnd4BQSo
+X6YG14J2fxmEOybcWfEA/jhiSodcF2CWfYprN029lT2PgoVf3vgFFl065xgW/6fM
+=GVWD
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild b/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild
index 0e5c2fd2b4eb99e2d9cf97002fdf0cce8de24ab2..a0351d90fab6aff4b84562841c6ec5e78e891e53 100644 (file)
--- a/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild
+++ b/dev-ruby/jeweler/jeweler-2.0.1-r1.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/jeweler/jeweler-2.0.1-r1.ebuild,v 1.4 2015/03/04 11:19:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jeweler/jeweler-2.0.1-r1.ebuild,v 1.5 2015/04/18 06:31:03 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -51,4 +51,7 @@ all_ruby_prepare() {
 
        # Use a non-deprecated version of construct
        sed -i -e 's/construct/test_construct/' -e 's/Construct/TestConstruct/' test/test_helper.rb || die
+
+       # Avoid dependency on cucumber
+       sed -i -e '/cucumber/,$ s:^:#:' Rakefile || die
 }