Bump to EAPI 4; use the new rspec recipe for testing, and stop using bundler (these last two let the test work instead of failing on a missing diff/lcs).

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 28 insertions, 9 deletions

diff --git a/dev-ruby/rack-test/ChangeLog b/dev-ruby/rack-test/ChangeLog
index e08ef38b53ee..2b1957a75bb2 100644
--- a/dev-ruby/rack-test/ChangeLog
+++ b/dev-ruby/rack-test/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rack-test
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-test/ChangeLog,v 1.21 2012/05/01 18:24:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-test/ChangeLog,v 1.22 2012/08/12 20:51:39 flameeyes Exp $
+
+  12 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> rack-test-0.6.1.ebuild:
+  Bump to EAPI 4; use the new rspec recipe for testing, and stop using bundler
+  (these last two let the test work instead of failing on a missing diff/lcs).
 
   01 May 2012; Raúl Porcel <armin76@gentoo.org> rack-test-0.5.7.ebuild:
   Drop ia64/sparc keywords
@@ -81,4 +85,3 @@
   21 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   +rack-test-0.5.3.ebuild, +metadata.xml:
   Initial import of rack-test, needed for sinatra's tests.
-
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index e8e3ba11c918..5437d7018cdc 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST rack-test-0.5.7.gem 20992 SHA256 09d0ebd4ce3def65934b48fcbbcb2703476d379ee487b5cf085696363f5e7e88 SHA512 0f0ecfb122f9ecc1d32c0d84e75c7e4cbb46ed5e3c3ff87ab5ad517d37703ce8d781130ea448f3d508db5fa122bf79952addee4518e4990c00a6ef63310e2292 WHIRLPOOL 71022a097a67db7f4cab8f536437c510ad972152e4aeb5fcd29935024ccf2b794773e3dd0f81cb810254f4eb35493c2ec32f59be49d03942d6d3ffe115d6bd04
 DIST rack-test-0.6.0.gem 20992 SHA256 73db265decd421dfab4ac02443e2ff8aaf86a10e28c8cbb36b132bdd31a5e1b7 SHA512 90c93cfa7a2ef26b5ef355adc429856371c70ceb489ed0e4ac6608fc1a798dee2594a5055d76a43feb6fca09ad6bc4561ad6cd9fa5bcf9810194bc92c8956703 WHIRLPOOL 3270d782f9654d6410ab3e1945b7dd3117bb5cdccdf0b8fcf347b02eb8c332fcad32da31feee614d3c599fdb513aa6b697d94e4f59f1d250ffb722424624e434
 DIST rack-test-0.6.1.gem 21504 SHA256 40731078f570c61d5fc5a57ddc3526ac08f083a0601e99ffd7672d281dc20543 SHA512 96348fc9a42c4f974038a3d7634030096bcb93faa27b8e1ad941f3b86aad71aefd77f68f6611b732a01786b33f90d30218eeb2cdae36bc07ac92c76077397224 WHIRLPOOL be2e4367c0e669c255c406e3b5c3f6ac1abf0dc81b468fb21b0d890ac0bec7f8c5af07f4e9f470fb6d82f6cff65e1587c2f037a80d68f88cffb9866fffa65c71
 EBUILD rack-test-0.5.7.ebuild 1030 SHA256 10ed8f43334a5c4d1cab260e53e6144a814d0847bf237529ca5849b13b1ac1ee SHA512 b27232dfb4196057dd9cc3e5267ffd31f00ca0ba92e54b0de78ca8deecbdb54d203f1ec1a7cb2d21f0732eab262c4e2d12084616b493d6525f824cd99aeb8393 WHIRLPOOL 398a80c10ee0b483a5f717318dc7d04ac6174af5841bb38520d3557b310689d1c9cd8d59a295ea8b962c9b090e791229d538f067d2cf637d2ec304b8ab4453f0
 EBUILD rack-test-0.6.0.ebuild 908 SHA256 f9e24d995603b740b4820cd09748f8cf1acd093bd7a26bf59a763eb7b2f22f65 SHA512 79b73c06bdbed5b59541e417f15e2fb554fb869cd17433a622f011f8eaa9548d161bd331b2046a57a35fe8e7015da2e73ff9ce12d8e531e4f875e7de390d7af5 WHIRLPOOL 21c3a8b62d39233822f8cda9e61ae93108f0b3f3ff2ab53fb112f66a35e16c7849de1e4e20e26a4b4e628c81768c3c5ebe8e726f263f723321e29279483a482b
-EBUILD rack-test-0.6.1.ebuild 965 SHA256 787851b5b032925ef18d41bee9ef4ed706daf25cccaa6cdcd6b474c4f9d01180 SHA512 bada100626eb119f7917163ed95fbc76f430693e84d0e1583e19bf8f07e62ec0ebecb08385e857188245db4839cd2030347a076d73fbbb061dc40ce9ad73d4ef WHIRLPOOL dc96855fc2ec82f021daaae0dab1fe6423a675d72947b80155998b22ead81a93d7a24175df72e7272f0ca4100f82e3fa5d5bb26a16654f9166360f083c0b50ca
-MISC ChangeLog 2831 SHA256 c633cdbd1d286dbe33713949943508a71ffc348895190b5560687ca27a043f68 SHA512 0836bf7f7e04942c850937df9cbb18acbb5862957f70cde8f522321e95b88b9be913e7520d3d2736a56b684a8156ae4283070be2904ac37e068296eeb4dd971e WHIRLPOOL 977d85fea5beb40a4129a014e0e7620de807c62baaf41773aec592c307c428fadb9baf4c9c8b2de5e7cbc9dd6360d4e4a2d53427fe0e417ad77939c119557dc4
+EBUILD rack-test-0.6.1.ebuild 993 SHA256 af9276d560463423c06879515dadba37ad8aba7b90b0366806d90bafc0431c7d SHA512 251d450bafc99cfc4e59a57fe0acc9ab9490c712462201765c1f4d62981144d42865896366f2e2f22611dc7480a21345bd8c192bbbc448bfdf0249f010893055 WHIRLPOOL e4fdfd17f4256ea8b4751e4d8bd8cb64a36bd36993087da550cd4ce7d896d9f952bf860679fb861cd323d2847a38e430fc82f390aa45ac80c8ddd9acd3da1818
+MISC ChangeLog 3071 SHA256 bb6a485cfcde0c9103bc52f43acfa839a0d6b389c5d82f31a476bebd3e8707de SHA512 8305bba46112b2614a19c1d7fb4056cf41e1d1efc75c5e7c39f16b30c3b3495793aa9f0bd885c0cde9868b9604113caa2c38c4490c8d0fe1cd31a8ab684fae84 WHIRLPOOL 2c74e72b07e72b6960160211d696a590acf3e5983464669d164de44262a145eae95785ab9f634ed31223f6f3cf156158784d565c3966ce6a3a71012f82c788a4
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQKBeiAAoJEBzRPIrUMBNCUaYIAJFXWmF3f7EFezchP2sxXuuK
+IpDTfNc+Q6rzTREkWmMI0VP7Rp9VfaXaaTWhsYvJ96jx5rnC8fjsm301j+oSMC1m
+tM03WyIKu7C7B/TDlMDVeAX9Z1FZMzZnpGI7nCdmnA5lvIhA7eboLjVS4St3yrze
+I2JP3lxZ0lSSTDkpOv5NX8yqJfJIDLXnZI+C7iK8cbYjbdcWse7JdTz4B8D0X+bz
+DBxxjrI9PZJ4D6pv2laDZJ34liU7pILWg2g/pd8PKMix5k38uCZR8wKbymRCby5L
+uknuapdsk3pKhRZXA97cnWeYVgHmAPwSHO8zZr+rSyy9IxwBWCus/TBvgMOpCMA=
+=QklM
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/rack-test/rack-test-0.6.1.ebuild b/dev-ruby/rack-test/rack-test-0.6.1.ebuild
index eadb7058e342..15140f936f8f 100644
--- a/dev-ruby/rack-test/rack-test-0.6.1.ebuild
+++ b/dev-ruby/rack-test/rack-test-0.6.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-test/rack-test-0.6.1.ebuild,v 1.4 2012/03/11 14:14:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack-test/rack-test-0.6.1.ebuild,v 1.5 2012/08/12 20:51:39 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
 
 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_TASK_DOC=""
 
-RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
 RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
 
@@ -23,8 +23,10 @@ KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-
 IUSE=""
 
 ruby_add_rdepend '>=dev-ruby/rack-1.0'
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 dev-ruby/bundler >=dev-ruby/sinatra-1.2.6 )"
+ruby_add_bdepend "
+	test? ( >=dev-ruby/sinatra-1.2.6 )"
 
 all_ruby_prepare() {
-	rm Gemfile.lock
+	rm Gemfile* || die
+	sed -i -e '/bundler/d' spec/spec_helper.rb || die
 }