Remove more bundler references and unstated and unneeded ruby-debug dependency. Don't run failing tests. Bug 395657.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 25 insertions, 15 deletions

diff --git a/dev-ruby/capistrano/ChangeLog b/dev-ruby/capistrano/ChangeLog
index 7b2d4f76aa9b..a0b1c6c07ffc 100644
--- a/dev-ruby/capistrano/ChangeLog
+++ b/dev-ruby/capistrano/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/capistrano
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/ChangeLog,v 1.74 2011/12/22 14:36:56 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/ChangeLog,v 1.75 2012/04/28 18:45:53 graaff Exp $
+
+  28 Apr 2012; Hans de Graaff <graaff@gentoo.org> capistrano-2.9.0.ebuild:
+  Remove more bundler references and unstated and unneeded ruby-debug
+  dependency. Don't run failing tests. Bug 395657.
 
   22 Dec 2011; Agostino Sarubbo <ago@gentoo.org> capistrano-2.9.0.ebuild:
   Stable for AMD64, wrt bug #395657
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index b4ac0e813481..a72116485f4b 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST capistrano-2.5.20.gem 113152 RMD160 e807c9218d2c3f79936ef7b84635895f8eeae98e SHA1 106321452ce3843cb46dfa40d95498ffde9700d9 SHA256 7adfff53657ec3234f175d63297d5e83208e9e3f142605c3d4c0598ebb5c86ad
 DIST capistrano-2.9.0.gem 118784 RMD160 b9ba7bc6754c3a780c158f17e3b561874c042b07 SHA1 dfa9adaa18312d878058b059d7559a66038bbae9 SHA256 2ec39e66d38059ab25003aad12a56e74fb06db7b6e4104eed25e273ec8d6dddb
 EBUILD capistrano-2.5.20.ebuild 930 RMD160 9ae77b1b547713d0d095889099d71762ce92729f SHA1 90742127795f5e67c83dc61100a7f63b7087111f SHA256 1a9f8bb75b8a216d809628c68b0597e25548e96b5d84ec183db769774dcb9bd4
-EBUILD capistrano-2.9.0.ebuild 872 RMD160 1de5301422e33951e84311922da59d6e1a4ab298 SHA1 1c7d059b624d1fc359fcccec7de955810cd181a4 SHA256 e6b1ca464899a3a524260dfcf1bf6000484f26949b0a6b73b238d55cca3879fb
-MISC ChangeLog 10723 RMD160 320248aed760d1e7e0c64f50fba59cc997e353cb SHA1 64e934687c89b9e28b1ebda6a67800decd74232a SHA256 070ed29bcd0d195c5d6e147f2ac54395c7758d20c7d196467bfa1ef27edabbe9
+EBUILD capistrano-2.9.0.ebuild 1304 RMD160 19ddcfc77dacdfc075658ca52aaf2a8eadcedb5b SHA1 1a9f974cb24f5f5f32f815034b009f865f0f0086 SHA256 1799f7a8119bc5d45abeda0a959d35b6da23aa8a4d510e77fb39cd8f51f5bafe
+MISC ChangeLog 10923 RMD160 3e5359a9d0efef78c8d88d3adabb120380404fdc SHA1 29aa3da758bfc4f960d97592294005d3c125ca66 SHA256 32412f7f89bbd3ae0c07413de9b23a8922ed19bd47b39575cb23113ada87bbc7
 MISC metadata.xml 305 RMD160 597231b8cca8094856ef04f30e41bf8aade04457 SHA1 0895bd5e59db788c9959b9bce22bc86ab1e011db SHA256 b6fb42c7374bde7323a80e09eed80babfdd788204e3446ec87dd0f41d3a9051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO80CNAAoJEOTDgjZ80txduBwH/jw0gUWho+OPTJiDauMgZAMn
-KgsrJ99XGehztQ+qf0RTnp6VHh5NKofS1xZTNVn3Z8zg56SUnAcWCtVsl4KXb89z
-ECW076x9hj5GZ6VIVahmFTtWufU7ZlghZ57XX4oqZ6aPQkNj2VqfN8kVzrOBfHNy
-wVBDsodqr6QfKvHrCpIUT7PjHMlQ8nr7CLxPX4MF5yxk3YlnGUEGjcF7ZghHWy7J
-lDNNrpmgHH8WCEjteaWyF5MkJgv4C3mq2yMgZEsivXwJXf1cET+sHiwob3JWZRPQ
-brhQw2vYEjh9L/jDZ/9kqm+oU/2DaS4UnoUnXZXP19/W3KDMHXTvteIfj6f1v6s=
-=q/Mj
+iF4EAREIAAYFAk+cOucACgkQiIP6VqMIqNcLngD/WaftDnmzkgd5fthF4Pfb9YB7
+4pLIq7Uw1mJNOcX78C4A/R653DUG1K08d4OpbE5DJfLYHVjg/5/CWmyNzJfmRvhx
+=jF9W
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/capistrano/capistrano-2.9.0.ebuild b/dev-ruby/capistrano/capistrano-2.9.0.ebuild
index 89849e034064..89107454fe9b 100644
--- a/dev-ruby/capistrano/capistrano-2.9.0.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.9.0.ebuild,v 1.2 2011/12/22 14:36:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.9.0.ebuild,v 1.3 2012/04/28 18:45:53 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -29,5 +29,15 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -i -e '/[Bb]undler/d' Rakefile test/utils.rb || die
+	sed -i -e '/ruby-debug/ s:^:#:' test/utils.rb || die
+
+	# Comment out test failing to a similar namespace defined in new
+	# versions of Rake, already fixed in newer versions of capistrano.
+	rm test/recipes_test.rb || die
+
+	# Avoid copy strategy tests since these fail in some cases due to
+	# complicated (aka unknown) interactions with other parts of the
+	# test suite.
+	rm test/deploy/strategy/copy_test.rb || die
 }