Port to rspec helper for testing. Make sure not to use git in the gemspec. Add a missing dependency over rspec-rails.

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

3 files changed, 28 insertions, 8 deletions

diff --git a/dev-util/cucumber-rails/ChangeLog b/dev-util/cucumber-rails/ChangeLog
index 413208f47620..bf9a54b2f4c3 100644
--- a/dev-util/cucumber-rails/ChangeLog
+++ b/dev-util/cucumber-rails/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cucumber-rails
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber-rails/ChangeLog,v 1.21 2012/06/12 11:49:01 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber-rails/ChangeLog,v 1.22 2012/08/14 15:47:51 flameeyes Exp $
+
+  14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  cucumber-rails-1.2.1.ebuild:
+  Port to rspec helper for testing. Make sure not to use git in the gemspec. Add
+  a missing dependency over rspec-rails.
 
   12 Jun 2012; Corentin Chary <iksaif@gentoo.org>
   cucumber-rails-0.3.2-r1.ebuild, cucumber-rails-1.0.6.ebuild,
@@ -115,4 +120,3 @@
   18 Dec 2009; Hans de Graaff <graaff@gentoo.org>
   +cucumber-rails-0.2.1.ebuild, +metadata.xml:
   Initial import. Spun off from dev-util/cucumber.
-
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 223afe359cc8..4bc2ef6bc237 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cucumber-rails-0.2.3-fix-broken-logic.patch 1062 SHA256 63064ad05a97b4c7b43f33f416258ab48530a962494e17828d2162c26177de02 SHA512 06aceb281ecd39087cad0eca11d964a2e5cc9d66260271e43067e5fdc20f4808edc4564fb9b551d38f96df1701dd864c504239626b971dd697675546aa31988d WHIRLPOOL f76fce0a5eeeebf745e8aa30524450ad00d0585286cde10d0ebbb97e53fa07bd463c0a7e51ffb5d403463698209b06ce5ce58e0d6c9e7ad53b5b30094ea07a31
 DIST cucumber-rails-0.3.2.gem 33280 SHA256 24f6722c23a8d03c8594573ce7ee16c5919c447e2b1f91307fb180c90dccf9cb SHA512 9ae1c30d667ec8638d730057ecbe86053b3dbbe295dde426df94bb137f71cfcc1bb657635cba55e345a39a56a8cff84ace896c1f607df1a72c113c7cd576aec4 WHIRLPOOL abbecb1f6a8de9dbef137cfe76a1d9471de1e12fee6bd22ebea4a123af7869309d333445aff4cfe408dc47541e7d5b3e528e2656d5457bc8b8418f6f38e81c1b
 DIST cucumber-rails-1.0.6.gem 41472 SHA256 b046e784b052cf29571bc367d065658915103c300abcfc7b7e1f898ae6c69be6 SHA512 b7fc95f351fc5f03aac4280ad703de2c08e3e2ea464c3e7a6336948aa461067ac9bcb716852aaaeac6d5ee567c370ca8b9fe49972b21761617c9c0eaffabeb1d WHIRLPOOL fc0221649d8f331e8f4585e91cca67806b96cf1ed96bf9c41ceda8bb98db29b57c57d12f709ec44a0214b5b30e1164f33c62c2a75c2a9e26f53c29f70f5e3822
 DIST cucumber-rails-1.2.1.gem 399360 SHA256 20ffa15cedda78fae88671da0ec4216a727314caeeeeae486ecd1c54c81d4745 SHA512 c26752f63eacd8854a616b3e94e9497f627f2e8d64419b3731fe9740ebe36f3f142e5cafb7e87c14229cabecc8146e479fb47989d6710edf140c68bfa1d80445 WHIRLPOOL 3bd91a1cab4eee0a343b3845cf89e255b1d89cad1a1c289a5d843b9ddfaa964f8297aad43c4d538c85317fda066b7d4fa7c50413ec603c98e4f8241a574cdd6a
 EBUILD cucumber-rails-0.3.2-r1.ebuild 888 SHA256 70414f5f0f6595b7255930b01f4663d75b10abe3b4680a42feb0a1aa04e2aeb3 SHA512 89e99799e5232e4b7df25565901edb5eff32bd9524ac896cbb50be18835d36f979909c76371f15fff3ec9adc51880923ab9ef295a873db1d33b33363c576b6f0 WHIRLPOOL 17cd837aed649c9b677f77f931db096e57284789963e6250f5bfbe10b0ffe396cfdf484eb0fa939318db7907d127b6b400b3a5c39eb1883858767f26330bc283
 EBUILD cucumber-rails-1.0.6.ebuild 956 SHA256 e79f734b729d334dadd6dafe73bd60f37507a4e6fad67867a0592ab3f2ce28b5 SHA512 0c2cc0a16202ecc5b180e70e86e599d274f89cb988ad2a94752a594c95fd26676e58baf7a6d0e348786ad08faa809227e3c69cda0236bf2bf61763cc7c385d4b WHIRLPOOL 8bb32be983050eaf7e853ef30b924315f66584c4485a885969dd5aa421e08b13e64a0f4777eb24f17df4c7ce830476231441b3e92214459c018149c256d92ed9
-EBUILD cucumber-rails-1.2.1.ebuild 993 SHA256 8470d68ac047244b115550b6730642f2d9fc4a62930a7e84a28dda34ae68a90d SHA512 10037ada553fd74155f701c9aaba7e90eac02836ba50e78c362af380258cf0d3731b4f9ef143b2f63c3720ab0f76f22b5c4371781daddb5fd5543568153131d9 WHIRLPOOL beeaf8933cb22a92d16d579ff240f398eb52d06097184e8c0f3980b0a3e48b18e1528a562ca60fa521270ca0384ee58d4b40613a65bc9ceca4a009f5bff0422c
-MISC ChangeLog 3719 SHA256 7670cd7876231dbd74390254efc43053966d2bdcff4e9e85073a99457d8e5f64 SHA512 a37851f9a1e14b1b473973947e83668ecb07adf490b34458e2c8b277ce8a4cbe71c666695e922f57a674aef6dfe2360dbfcacf84327e1fda26420286bc304afd WHIRLPOOL 83a196e4cb220627ae87f9b59c2407cf4820e95d26e43fc780740ce2e4c158db0b57dbe0d7e03c07e73d9a36f3e9560cab1a443c27af2037b3d9f13e95f6cf47
+EBUILD cucumber-rails-1.2.1.ebuild 1053 SHA256 8592396c05122a0f06bb1be941790ce1970502aa0932c95b2c05de33ce93a5d6 SHA512 1df6c9d8d6c950f822999404c43c81ea394368c5714a3df099cf4f075ccf800dc39f34b090b251b512bf2add567d68133661eaa018c30aeef7efa3dc14400799 WHIRLPOOL 32e3745f78b62bae587ff1e82929165620432721cb41c5227e603afef5c7c6c0e1e62c2926abd410200fadbaedbf4c4264b8f491a9d5f75131543d6ae8701bcc
+MISC ChangeLog 3931 SHA256 fb62c1007fbadb76dbf7a686f9418d05821cbecd43c16453a77d4c0e3d88e8d0 SHA512 7cd2702302abeb2bf2b3d9617316edfd73a9df9b7d9011b82476cb0951c49de55ee65f9ca5aa44b21bde1ae94875ead5b25f41ee7d1eed717dff82dbd97aecf6 WHIRLPOOL be10d9b2429aa916d12a3f8eb9f2300d159829835c2a8041e777a34c25b98a2d26daf01b30992075530fa0d564da464fe5ce887ea0f5536a8b07bc16146c3fe6
 MISC metadata.xml 201 SHA256 c90b12c6600840878686d4544dbc51d97b0715add76b40d9400415cdef6324ad SHA512 3131e5281b343002ef359d7199da425d3f9f5406ef4ddd9332eccad6b78e3ced62adedd4dfe14538db391d2590811df6f2a15cada5a1e924479a0189cd69b7d3 WHIRLPOOL 8631f9384237d55afedca6bba2e9e6b80f5d260ec195de52a736072d4c743579e435c363404e0561a05708c07fbb92e21d69aaff1273b9f724d25b3f59b26fe6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQKnNCAAoJEBzRPIrUMBNCHHEIAIXRSnDTX28ac2o9uE57FDNV
+rNmKpxHo1yZiy6g72t7X9wqnz1OgdsSqa57V5zXsEvcJt3Tl8W0y8oHKUPjsZFtP
++nPKw1SyQw739J+ofY6LRAmNGWvTBQYjwd9yuVPwAZXC1hoTvPnzWMD0UgTMOId1
+jidxwjJA6vmlX0hAYnWKg87PGk4t4Tio9q/Nidlz0loeCk6G8csRY3kWXCt5NdxZ
+ORFrtTejokrW+aQBfbBBHKU4rQxYX3s9SN0ESfS/ubfsfXMeAH91u16xC+zSXW+G
+W0opIQ1m48rRlk1GjhHj+yjyOcpSavOuaNYR9NRxiyPMI6qrwZiM/Ky9NwiFEu8=
+=6Bk8
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.2.1.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.2.1.ebuild
index b951c580f468..1f81e669a59c 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.2.1.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.2.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-util/cucumber-rails/cucumber-rails-1.2.1.ebuild,v 1.3 2012/06/12 11:49:01 iksaif Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cucumber-rails/cucumber-rails-1.2.1.ebuild,v 1.4 2012/08/14 15:47:51 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 ree18"
@@ -9,7 +9,7 @@ RUBY_FAKEGEM_TASK_DOC=""
 
 # There are also cucumber features. They require a Rails project with
 # factory girl which we don't have packaged yet.
-RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
 RUBY_FAKEGEM_EXTRADOC="History.md README.md"
 
@@ -25,9 +25,10 @@ KEYWORDS="~amd64"
 SLOT="1"
 IUSE=""
 
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-2.6:2
+ruby_add_bdepend "
+	test? (
 		>=dev-ruby/ammeter-0.2.1
+		dev-ruby/rspec-rails
 	)"
 
 ruby_add_rdepend "
@@ -38,4 +39,5 @@ ruby_add_rdepend "
 all_ruby_prepare() {
 	rm Gemfile || die
 	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 }