From: Hans de Graaff <graaff@gentoo.org>
Date: Wed, 3 Aug 2011 06:19:46 +0000 (+0000)
Subject: Remove blocker on capistrano-launcher now that it is masked.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c1f4d556166f3509ed955deb2f2a947b2978d9e0;p=gentoo.git

Remove blocker on capistrano-launcher now that it is masked.

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

diff --git a/dev-ruby/capistrano/ChangeLog b/dev-ruby/capistrano/ChangeLog
index 149768104e88..3377903d8bd6 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.70 2011/08/03 06:18:29 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/ChangeLog,v 1.71 2011/08/03 06:19:46 graaff Exp $
+
+  03 Aug 2011; Hans de Graaff <graaff@gentoo.org> capistrano-2.5.20.ebuild,
+  capistrano-2.6.0.ebuild:
+  Remove blocker on capistrano-launcher now that it is masked.
 
 *capistrano-2.8.0 (03 Aug 2011)
 
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 8c5557fa2340..daf820c3dacc 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 DIST capistrano-2.5.20.gem 113152 RMD160 e807c9218d2c3f79936ef7b84635895f8eeae98e SHA1 106321452ce3843cb46dfa40d95498ffde9700d9 SHA256 7adfff53657ec3234f175d63297d5e83208e9e3f142605c3d4c0598ebb5c86ad
 DIST capistrano-2.6.0.gem 114688 RMD160 96bf9ffc94c09a5d44d71007379d6520a9e85b38 SHA1 f5bd65be69a91c1e164ba28292c2f514ed63134e SHA256 25693dd42d618c24c4acb1772fbb6f9523df2f7964013aeb811b093b3d47f992
 DIST capistrano-2.8.0.gem 116736 RMD160 85a17153a2b8d1a99aacc22899a850577d03c9df SHA1 7c6b8d638419f5d89499a81adf2258deefc89f89 SHA256 24dc7418b899f4109f2e9262dd50ebd35ab816373af366b0cddb1ff64195cc44
-EBUILD capistrano-2.5.20.ebuild 984 RMD160 3acea97801968906f6a8ec3b7641e8a583f6effe SHA1 3350502f28254f2a5de64f21dcad8cd6417f59f6 SHA256 cb02ccd83f984f58c0d6a8c010748d6319666f577ae2aa995efbc612ba7cd813
-EBUILD capistrano-2.6.0.ebuild 987 RMD160 f4264c2ba9bcb7a869d6191536d6986bbd4f7638 SHA1 e93fa9fb8e1739943f024fd94430b20300700574 SHA256 3e768cd631509259ab1b6670ed3b2a01ce43560adb297522d8e8e3329f0b664f
+EBUILD capistrano-2.5.20.ebuild 930 RMD160 9ae77b1b547713d0d095889099d71762ce92729f SHA1 90742127795f5e67c83dc61100a7f63b7087111f SHA256 1a9f8bb75b8a216d809628c68b0597e25548e96b5d84ec183db769774dcb9bd4
+EBUILD capistrano-2.6.0.ebuild 934 RMD160 fa35ccaf7762a714f15381ef7ccababa47016bf5 SHA1 f324b37ff3ae3ed7a3e0f4e168e0caf5dfa5b402 SHA256 f41e9a75c133ab35124e1265dc8120340482e0c222816cdea6349d3100a2ea04
 EBUILD capistrano-2.8.0.ebuild 876 RMD160 3e151a31aac02120c8ee490bc537e945e6164e6b SHA1 e9bf7e6432549058ad7547fd574b474bf49df4ba SHA256 7058b50833c1a2ba9ba791046ea1b9a7feba39328794843e97475830b605507c
-MISC ChangeLog 10194 RMD160 40c44d16d7207d144f977cfe5e9f188617c59663 SHA1 f71f215a6a26182da023dbcaaefbe9631a6231d4 SHA256 7320717e5ebf229a504b5bbbf94b98ab04f092591c30096ddc9d46929ac6fc38
+MISC ChangeLog 10361 RMD160 c8ed3caf98b47f4d928058410eb68e136c28e146 SHA1 9e5bfce9ab82972c2622217451ae98f893a86490 SHA256 c35c7a192d4e3583b8aadc77137ceaa0373a28674290ed81d79fed35632eb614
 MISC metadata.xml 305 RMD160 597231b8cca8094856ef04f30e41bf8aade04457 SHA1 0895bd5e59db788c9959b9bce22bc86ab1e011db SHA256 b6fb42c7374bde7323a80e09eed80babfdd788204e3446ec87dd0f41d3a9051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk446DsACgkQiIP6VqMIqNd8GAD/UBdiZR8QJMIoTGdwjDYN2Xz8
-8iC7GTpdBPBkhD/xlz0A/2KA23LQa1SBAndiqVYE6EypthKMIL003ppVP8/9toLe
-=hf8r
+iF4EAREIAAYFAk446IcACgkQiIP6VqMIqNer/wD+PTpnjJUjqopQd5Dn8XahdqAY
+WkZpXTFp82fF9DbemNEA/3qRtYER7PNSD7FOgll7TIjCxFZXeBAoD8QIkg1IETeD
+=4KtG
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/capistrano/capistrano-2.5.20.ebuild b/dev-ruby/capistrano/capistrano-2.5.20.ebuild
index 8970bec92df7..714ccb62b9c4 100644
--- a/dev-ruby/capistrano/capistrano-2.5.20.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.5.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.5.20.ebuild,v 1.5 2011/07/22 20:57:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.5.20.ebuild,v 1.6 2011/08/03 06:19:46 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -28,9 +28,6 @@ ruby_add_rdepend "
 ruby_add_bdepend "
 	test? (	dev-ruby/mocha )"
 
-RDEPEND="${RDEPEND}
-	!dev-ruby/capistrano-launcher"
-
 each_ruby_prepare() {
 	# Remove Jeweler check_dependencies task
 	sed -i '/check_dependencies/d' Rakefile
diff --git a/dev-ruby/capistrano/capistrano-2.6.0.ebuild b/dev-ruby/capistrano/capistrano-2.6.0.ebuild
index ec726751cd4c..c27b615e71cc 100644
--- a/dev-ruby/capistrano/capistrano-2.6.0.ebuild
+++ b/dev-ruby/capistrano/capistrano-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.6.0.ebuild,v 1.1 2011/05/06 14:43:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.6.0.ebuild,v 1.2 2011/08/03 06:19:46 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -28,9 +28,6 @@ ruby_add_rdepend "
 ruby_add_bdepend "
 	test? (	dev-ruby/mocha )"
 
-RDEPEND="${RDEPEND}
-	!dev-ruby/capistrano-launcher"
-
 each_ruby_prepare() {
 	# Remove Jeweler check_dependencies task
 	sed -i '/check_dependencies/d' Rakefile