Add ruby20. Fix double sudo in cleanup task.

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

4 files changed, 73 insertions, 2 deletions

diff --git a/dev-ruby/capistrano/ChangeLog b/dev-ruby/capistrano/ChangeLog
index 74a92f809c43..bae64c3ae64e 100644
--- a/dev-ruby/capistrano/ChangeLog
+++ b/dev-ruby/capistrano/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/capistrano
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/ChangeLog,v 1.102 2014/05/15 01:07:07 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/ChangeLog,v 1.103 2014/08/13 13:20:26 graaff Exp $
+
+*capistrano-2.15.5-r1 (13 Aug 2014)
+
+  13 Aug 2014; Hans de Graaff <graaff@gentoo.org> +capistrano-2.15.5-r1.ebuild,
+  +files/capistrano-2.15.5-sudo-cleanup.patch:
+  Add ruby20. Fix double sudo in cleanup task.
 
   15 May 2014; Manuel Rüger <mrueg@gentoo.org> -capistrano-2.14.2.ebuild,
   capistrano-2.15.5.ebuild:
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 5a6e509e05b1..7f588957883e 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX capistrano-2.15.5-sudo-cleanup.patch 656 SHA256 1511705245ce1bafc7a37c077e00964320241fe4cdf2e696a5c4547f507489ec SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f WHIRLPOOL 51b8f0f1e1479558b6211b2e6815160ed1faf3532dedc4925c8e09d9ea65753fc9786ae37e3664185c7beb266d4626a92a149f7a68f3a2ae064c39c2ab23ea84
 DIST capistrano-2.15.5.gem 132096 SHA256 3eb22ec58176918f44a71126b9bb8a1a34ae4efb99835eb72e187d03916604aa SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff WHIRLPOOL 452b5977e08762e0f01822734517010228fd3398e6d5e19041483dae9a7f6bfb3d4940b15a20c3a3cd30205f62563c919b3057294cd82ccb99cb96abefcb8136
+EBUILD capistrano-2.15.5-r1.ebuild 1209 SHA256 f8441856e987924897d95896ebe671f0b229dbc97834ce325938a1dc0afb2ce8 SHA512 21bad7272baf4ba0c31cdb8b1e7d0b88506a0e3c2cb96d817577635ca3aa0a4cdba34bcdbab60b0eb7934e59c4d47139214f5d93ef99e18f76a232cc92dc07b0 WHIRLPOOL 6c99f6e567f04d897186b6f9a23601d3807bc3a4f03ab4a7e42b287d3ccf3afbdbd4c7a0086c476540fee1ccb65d70dac8aef7f64746f0749e8ea01854a973cf
 EBUILD capistrano-2.15.5.ebuild 1152 SHA256 6ee8f87e85f764f7956c8d9f4eed28a1795838f70790a121602905d233b5df13 SHA512 c48759785d3aca650d7c11d21e02fab72eb42946ace83bf82e298926b80b7b97ac3a4d1e82446bbaae69acaab89da35db8124a49bae5726a2c4c76e357118e43 WHIRLPOOL ac432832412cde5a74f2b2175b9f571788ac2c1123fce1060ed12d4d9cfb6395e72d1ea88d1218a72b0f617334d28cc3ce38dc2e9075d1d3f782e33afa539f45
-MISC ChangeLog 14081 SHA256 550e89ed76e738332a2b69dd3b1356aa6c7eda613579d3b0b0c16ca1dee39f81 SHA512 2a76364dce8a63c3d9fe54b8de1e5bbc8f38606a671d98aa35d904dd63a9451f8948c07045d2677fd2a1ca99308c74deda5e0134dbfb862998bc191b87cf00cc WHIRLPOOL 3d2bf65f309c4e086d0e7c35486f5c2307f63633fb399efec58291a5809c24bd308cfc9e9c6fd5e2fad807b0c697e7b39f92905b66c58b51bd70ed66cfeff143
+MISC ChangeLog 14294 SHA256 5e1e46f22c8712d0d63be4208a7d7998e1c2b8bee1e61871587a463fcbd49b4a SHA512 891d03577ab3a4b3187f3fa0b47fd51d3c991ca60a4e45e6fc2451df464d053f2f81580e5b49761ad6c30911d3d2ba71834fe4649128ebe249c42c28cd6b569d WHIRLPOOL ed444b20e21dbb9f99ce0b94a3005cd5fa120b68e9987b656e711c6c3b5092f3179723f15995de5378c3d1857b44d0c57051407e477de1fea48056003b660dd4
 MISC metadata.xml 305 SHA256 b6fb42c7374bde7323a80e09eed80babfdd788204e3446ec87dd0f41d3a9051b SHA512 6f87cf2f21c12a775b497353298b165c2ba3de07b7326aa350053d6a0e5737b04b19b21803a20a18983bbd53a4aa188de5851c80d658b6a223759c498ef3e66b WHIRLPOOL 8b04b4dacc283c59397326858dcf0af54eb3ea33b1889df6f41e0c7a3af2435a3fbb3abc1c5ebb18d23d0067216c325c616183faeb310cbfacfd187ec30f5cb4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlPrZk8ACgkQiIP6VqMIqNcVgwD9F01j4xhExWe+H0kVO0eIQ10c
+LicptIpitUljmyzyBCYA/3N5LBtyAuJFJ18m2CxiOzn6Y+Ghu/fAJ//pC03RUYY6
+=WdgC
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
new file mode 100644
index 000000000000..c1e88edcc8ab
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.15.5-r1.ebuild,v 1.1 2014/08/13 13:20:26 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="http://capify.org/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.0.14
+	>=dev-ruby/net-sftp-2.0.2
+	>=dev-ruby/net-scp-1.0.2
+	>=dev-ruby/net-ssh-gateway-1.1.0
+	>=dev-ruby/highline-1.2.7"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha:0.12 )"
+
+RUBY_PATCHES=( ${P}-sudo-cleanup.patch )
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile test/utils.rb || die
+	sed -i -e '/pry/ s:^:#:' -e '4igem "mocha", "~>0.12.0"' test/utils.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
+}
diff --git a/dev-ruby/capistrano/files/capistrano-2.15.5-sudo-cleanup.patch b/dev-ruby/capistrano/files/capistrano-2.15.5-sudo-cleanup.patch
new file mode 100644
index 000000000000..cbe68a476fd4
--- /dev/null
+++ b/dev-ruby/capistrano/files/capistrano-2.15.5-sudo-cleanup.patch
@@ -0,0 +1,12 @@
+diff -ur /usr/lib/ruby/gems/1.9.1/gems/capistrano-2.15.5/lib/capistrano/recipes/deploy.rb ./lib/capistrano/recipes/deploy.rb
+--- ./lib/capistrano/recipes/deploy.rb	2014-08-13 15:11:31.423773610 +0200
++++ /usr/lib/ruby/gems/1.9.1/gems/capistrano-2.15.5/lib/capistrano/recipes/deploy.rb	2014-05-04 11:40:39.000000000 +0200
+@@ -462,7 +462,7 @@
+   DESC
+   task :cleanup, :except => { :no_release => true } do
+     count = fetch(:keep_releases, 5).to_i
+-    try_sudo "ls -1dt #{releases_path}/* | tail -n +#{count + 1} | #{try_sudo} xargs rm -rf"
++    run "ls -1dt #{releases_path}/* | tail -n +#{count + 1} | #{try_sudo} xargs rm -rf"
+   end
+ 
+   desc <<-DESC