Version bump for 2.0.0, and revision bump for 1.4.1-r1. They now post-depend on capistrano-launcher which provides /usr/bin/cap. Removed unneeded \'inherit ruby\', and USE_RUBY. Dropped ia64 keyword for > 1.9, as highline is lacking a keyword.

Package-Manager: portage-2.1.3.7

9 files changed, 116 insertions, 34 deletions

diff --git a/dev-ruby/capistrano/ChangeLog b/dev-ruby/capistrano/ChangeLog
index b9f135fdb205..3a57afba8bcc 100644
--- a/dev-ruby/capistrano/ChangeLog
+++ b/dev-ruby/capistrano/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-ruby/capistrano
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/ChangeLog,v 1.19 2007/09/01 19:55:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/ChangeLog,v 1.20 2007/09/01 21:58:33 nichoj Exp $
+
+*capistrano-2.0.0 (01 Sep 2007)
+*capistrano-1.4.1-r1 (01 Sep 2007)
+
+  01 Sep 2007; Joshua Nichols <nichoj@gentoo.org> capistrano-1.4.1.ebuild,
+  +capistrano-1.4.1-r1.ebuild, capistrano-1.99.1.ebuild,
+  capistrano-1.99.3.ebuild, +capistrano-2.0.0.ebuild:
+  Version bump for 2.0.0, and revision bump for 1.4.1-r1. They now post-depend
+  on capistrano-launcher which provides /usr/bin/cap. Removed unneeded
+  'inherit ruby', and USE_RUBY. Dropped ia64 keyword for > 1.9, as highline is lacking a keyword.
 
   01 Sep 2007; Joshua Nichols <nichoj@gentoo.org> capistrano-1.4.1.ebuild,
   capistrano-1.99.1.ebuild, capistrano-1.99.3.ebuild:
@@ -33,7 +43,7 @@
   capistrano-1.4.1.ebuild:
   stable x86, bug 173040
 
-  02 Apr 2007; Raúl Porcel <armin76@gentoo.org> capistrano-1.4.1.ebuild:
+  02 Apr 2007; Raúl Porcel <armin76@gentoo.org> capistrano-1.4.1.ebuild:
   ia64 stable wrt bug 173040
 
   04 Mar 2007; Tom Gall <tgall@gentoo.org> capistrano-1.4.1.ebuild:
@@ -56,11 +66,11 @@
   +capistrano-1.3.1.ebuild:
   Version bump.
 
-  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   capistrano-1.1.0.ebuild:
   Convert to use elog.
 
-  11 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
+  11 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
   capistrano-1.1.0.ebuild:
   Add ~amd64 wrt bug #154697.
 
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 70a46ffec4d9..65325f94949f 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,22 +1,31 @@
 DIST capistrano-1.4.1.gem 49152 RMD160 f6ba17b610c039ed88db6bb5ae86bd21a61ad5bf SHA1 9ddabc73dcd83ff1f0a454fd8174d28a79a4b329 SHA256 2ed5ec04a2492fa5a9f9dc9b613990c5866935a8c193a9476fd73b29c98a7313
 DIST capistrano-1.99.1.gem 77312 RMD160 fa31dd91ae15df999be933472a8a4506105a8bcf SHA1 5dcbb53a940875b5d0ea39342542493c4feb48c4 SHA256 6023db6a39a3b2c1e860efdeb2313c4aca9003ba331970bbb5a5ae8d315ae6ac
 DIST capistrano-1.99.3.gem 83456 RMD160 7324941e17fa4de997aa7afc1c0343c78fd6fa2c SHA1 3ec054d911628dbdccca5969959dc681d2544885 SHA256 3a2bb85ab4a207a3097b3e9ec26d1fc966fd2c2dfcf8c628c6765234558220d1
-EBUILD capistrano-1.4.1.ebuild 936 RMD160 e7fbf11b0784ce5d258c892e9eba5b7cc8ca111d SHA1 28a0730f4c4946b8f3b44e2c92be33de63412ae1 SHA256 3b4caa0865d56a7448a8542ca7617cc8acd1ed10b3c17c2f903e016778c0ee0c
-MD5 affdb57c432477c5bf33d9e5053eb6d9 capistrano-1.4.1.ebuild 936
-RMD160 e7fbf11b0784ce5d258c892e9eba5b7cc8ca111d capistrano-1.4.1.ebuild 936
-SHA256 3b4caa0865d56a7448a8542ca7617cc8acd1ed10b3c17c2f903e016778c0ee0c capistrano-1.4.1.ebuild 936
-EBUILD capistrano-1.99.1.ebuild 1072 RMD160 818da396dbb76db897b45a795336f72c354b0b0c SHA1 4d5700a3d19a775a8131481c3476082ac4204bd6 SHA256 ee2644433acffacc44dfc0e43421f1790cf7bd83aa821d0bee558d4fe59d8c3f
-MD5 37144023c2399277aa59868618795464 capistrano-1.99.1.ebuild 1072
-RMD160 818da396dbb76db897b45a795336f72c354b0b0c capistrano-1.99.1.ebuild 1072
-SHA256 ee2644433acffacc44dfc0e43421f1790cf7bd83aa821d0bee558d4fe59d8c3f capistrano-1.99.1.ebuild 1072
-EBUILD capistrano-1.99.3.ebuild 1072 RMD160 65688b1c0ae94439d472df5b1c508f016a4df8c5 SHA1 a614bac89fcc9549502d06bb64d1480c612d4284 SHA256 ca41730945d4e461cf93359084b8129d262bd4c614013cbca32f6ad685fc0d87
-MD5 f5aa067ec290eb5230297c7b4e7bda88 capistrano-1.99.3.ebuild 1072
-RMD160 65688b1c0ae94439d472df5b1c508f016a4df8c5 capistrano-1.99.3.ebuild 1072
-SHA256 ca41730945d4e461cf93359084b8129d262bd4c614013cbca32f6ad685fc0d87 capistrano-1.99.3.ebuild 1072
-MISC ChangeLog 2853 RMD160 b44e579abfa0781797adf165177aa2191df5c2d1 SHA1 dcde2c931a7a5eaa6ad4205214a5d2814ad5fd1c SHA256 e60043166f1ec7f477aa50bafd95db50aaf1d4a559fa3361f517174003ff59c0
-MD5 311fe626bcf3f3c821c2e9ffa472d61a ChangeLog 2853
-RMD160 b44e579abfa0781797adf165177aa2191df5c2d1 ChangeLog 2853
-SHA256 e60043166f1ec7f477aa50bafd95db50aaf1d4a559fa3361f517174003ff59c0 ChangeLog 2853
+DIST capistrano-2.0.0.gem 84480 RMD160 15c01d1a2313f7e0e7ac61dd5d415ad939ab5c1a SHA1 0aa567fe60a77c34acd4b48a74c2e46e8ac4b431 SHA256 353dfe6868d6c2007d63b9f62e833581f0a839850d3646d90ca258e964cf2ad6
+EBUILD capistrano-1.4.1-r1.ebuild 773 RMD160 de15bfb07ce1c211a851cb3df3e1f8beb19ce0e4 SHA1 18d2975beb60cbdd9acdbec1c10cb72bd840efd8 SHA256 41e17935f44ab89acfecf45ec69cabaaf36390aa326ba342c2ef853b5972d056
+MD5 1ecec1aca24e47e271eaefa5db679c15 capistrano-1.4.1-r1.ebuild 773
+RMD160 de15bfb07ce1c211a851cb3df3e1f8beb19ce0e4 capistrano-1.4.1-r1.ebuild 773
+SHA256 41e17935f44ab89acfecf45ec69cabaaf36390aa326ba342c2ef853b5972d056 capistrano-1.4.1-r1.ebuild 773
+EBUILD capistrano-1.4.1.ebuild 896 RMD160 15d1485d70b0fc356e330967d58eaeaf4ccbf79c SHA1 e83579dec715f864f449e80ff6bc7a758458bb2a SHA256 1585712ef5ec929f4ec4198073d41a15a810853b235c1070b5439c9bad314dec
+MD5 a3964c316795e7f4c5f317a7203524c0 capistrano-1.4.1.ebuild 896
+RMD160 15d1485d70b0fc356e330967d58eaeaf4ccbf79c capistrano-1.4.1.ebuild 896
+SHA256 1585712ef5ec929f4ec4198073d41a15a810853b235c1070b5439c9bad314dec capistrano-1.4.1.ebuild 896
+EBUILD capistrano-1.99.1.ebuild 1026 RMD160 e9405653144dbf014ef36fcde2447ab2748a9d1e SHA1 ea55e82a4dc12e5175224ba184eaff7d1a465991 SHA256 ee65f15e080850182f7e4a9d6a5507bf4dbf9c488bb090b616e2040351b3973a
+MD5 cc27cbf405eb12bddb98cdbb1df353b0 capistrano-1.99.1.ebuild 1026
+RMD160 e9405653144dbf014ef36fcde2447ab2748a9d1e capistrano-1.99.1.ebuild 1026
+SHA256 ee65f15e080850182f7e4a9d6a5507bf4dbf9c488bb090b616e2040351b3973a capistrano-1.99.1.ebuild 1026
+EBUILD capistrano-1.99.3.ebuild 1026 RMD160 0e7d2b50a6d2e03599b9bc1359f618fc345453b2 SHA1 41855086573be84ca1e23e94d8a4480f28d657c7 SHA256 7b48b6cd4e42ff8563517aa045119dc64900596eee60e91b03fc88fd690f4064
+MD5 24a4a5a86c3992cf7aaa9a83b8753e99 capistrano-1.99.3.ebuild 1026
+RMD160 0e7d2b50a6d2e03599b9bc1359f618fc345453b2 capistrano-1.99.3.ebuild 1026
+SHA256 7b48b6cd4e42ff8563517aa045119dc64900596eee60e91b03fc88fd690f4064 capistrano-1.99.3.ebuild 1026
+EBUILD capistrano-2.0.0.ebuild 768 RMD160 3a5f9fa223a2b38481a20266dd2ab605f85141e7 SHA1 8f25b13e1f7739172c622be0c69990ea0a338b68 SHA256 e53e79d5e56a65508ff2154814c2345663c3ef263281734afe351e97e72d1ee6
+MD5 9914887f8e9a9b2bec0e3b76840adffa capistrano-2.0.0.ebuild 768
+RMD160 3a5f9fa223a2b38481a20266dd2ab605f85141e7 capistrano-2.0.0.ebuild 768
+SHA256 e53e79d5e56a65508ff2154814c2345663c3ef263281734afe351e97e72d1ee6 capistrano-2.0.0.ebuild 768
+MISC ChangeLog 3362 RMD160 45882ae316c5ca97a6cacfaf0542e12911638e46 SHA1 f23f41174e37af2903a3f5e8b635ff0a845b0feb SHA256 ad5191312c89c01e06a1c4e31f6af5fb069e4bd88e63b7f1c940fb3abc719726
+MD5 5e9f51d1cf953f6227e780a52c4be593 ChangeLog 3362
+RMD160 45882ae316c5ca97a6cacfaf0542e12911638e46 ChangeLog 3362
+SHA256 ad5191312c89c01e06a1c4e31f6af5fb069e4bd88e63b7f1c940fb3abc719726 ChangeLog 3362
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -24,9 +33,15 @@ SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata
 MD5 f19259f6432d55c7837ddab2f24162f9 files/digest-capistrano-1.4.1 238
 RMD160 a3304e1e6184aa848084f47b40b1fcf1f3059511 files/digest-capistrano-1.4.1 238
 SHA256 e3cc176069e8d4255275851a25fd1f5cf147ed7c1a032309553dd5782855550c files/digest-capistrano-1.4.1 238
+MD5 f19259f6432d55c7837ddab2f24162f9 files/digest-capistrano-1.4.1-r1 238
+RMD160 a3304e1e6184aa848084f47b40b1fcf1f3059511 files/digest-capistrano-1.4.1-r1 238
+SHA256 e3cc176069e8d4255275851a25fd1f5cf147ed7c1a032309553dd5782855550c files/digest-capistrano-1.4.1-r1 238
 MD5 9fbc9b473b915e6fc1fdb253db3862d1 files/digest-capistrano-1.99.1 241
 RMD160 1213057c2e46784b8d2f2bacb871277917661170 files/digest-capistrano-1.99.1 241
 SHA256 0e61ca9667b2d3322690fa16e8f5673c3ded82384755a1f9929b853b9a867077 files/digest-capistrano-1.99.1 241
 MD5 f4020ce378e0ccf964aa8ada80e32c4b files/digest-capistrano-1.99.3 241
 RMD160 7648c88c7150e1b79dd1cf2a35fa1aa6f924c2e0 files/digest-capistrano-1.99.3 241
 SHA256 6ef55e24b896a74e95e408d21ef67bfb6320781ef34c246e3d45f55043e01396 files/digest-capistrano-1.99.3 241
+MD5 5cc9f303ecbe625e28e43c76fedad778 files/digest-capistrano-2.0.0 238
+RMD160 7e0e67200c62ce087b8c809aca4a6f2e69e8b7a6 files/digest-capistrano-2.0.0 238
+SHA256 d68230167d3f99b2607befb71df5f392fea66263ac2b3a38371eaf473f55e6f6 files/digest-capistrano-2.0.0 238
diff --git a/dev-ruby/capistrano/capistrano-1.4.1-r1.ebuild b/dev-ruby/capistrano/capistrano-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..848b2e445d36
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-1.4.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-1.4.1-r1.ebuild,v 1.1 2007/09/01 21:58:33 nichoj Exp $
+
+inherit gems
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="http://rubyforge.org/projects/capistrano/"
+SRC_URI="http://gems.rubyforge.org/gems/${P}.gem"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ruby-1.8.2
+	>=dev-ruby/rake-0.7.0
+	>=dev-ruby/net-ssh-1.0.10
+	>=dev-ruby/net-sftp-1.1.0"
+PDEPEND="dev-ruby/capistrano-launcher"
+
+src_install() {
+	gems_src_install
+
+	# Deleted cap, as it will be provided by capistrano-launcher
+	rm "${D}/usr/bin/cap"
+	rm "${D}/${GEMSDIR}/bin/cap"
+}
diff --git a/dev-ruby/capistrano/capistrano-1.4.1.ebuild b/dev-ruby/capistrano/capistrano-1.4.1.ebuild
index 0d791b6e51f1..d2cbe963983c 100644
--- a/dev-ruby/capistrano/capistrano-1.4.1.ebuild
+++ b/dev-ruby/capistrano/capistrano-1.4.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-1.4.1.ebuild,v 1.7 2007/09/01 19:55:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-1.4.1.ebuild,v 1.8 2007/09/01 21:58:33 nichoj Exp $
 
-inherit ruby gems
+inherit gems
 
-USE_RUBY="ruby18"
 DESCRIPTION="A distributed application deployment system"
 HOMEPAGE="http://rubyforge.org/projects/capistrano/"
 SRC_URI="http://gems.rubyforge.org/gems/${P}.gem"
@@ -13,7 +12,6 @@ LICENSE="MIT"
 SLOT="1"
 KEYWORDS="amd64 ia64 ppc64 x86"
 IUSE=""
-#RESTRICT="test"
 
 DEPEND=">=dev-lang/ruby-1.8.2
 	>=dev-ruby/rake-0.7.0
diff --git a/dev-ruby/capistrano/capistrano-1.99.1.ebuild b/dev-ruby/capistrano/capistrano-1.99.1.ebuild
index c0a5902c637d..64818ad45230 100644
--- a/dev-ruby/capistrano/capistrano-1.99.1.ebuild
+++ b/dev-ruby/capistrano/capistrano-1.99.1.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-1.99.1.ebuild,v 1.2 2007/09/01 19:55:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-1.99.1.ebuild,v 1.3 2007/09/01 21:58:33 nichoj Exp $
 
-inherit ruby gems
+inherit gems
 
-USE_RUBY="ruby18"
 DESCRIPTION="A distributed application deployment system"
 HOMEPAGE="http://capify.org/"
 SRC_URI="http://gems.rubyonrails.com/gems/${P}.gem"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
-#RESTRICT="test"
 
 DEPEND=">=dev-lang/ruby-1.8.2
 	>=dev-ruby/rake-0.7.0
diff --git a/dev-ruby/capistrano/capistrano-1.99.3.ebuild b/dev-ruby/capistrano/capistrano-1.99.3.ebuild
index 79d4b3c6b572..ea748f7e5cc7 100644
--- a/dev-ruby/capistrano/capistrano-1.99.3.ebuild
+++ b/dev-ruby/capistrano/capistrano-1.99.3.ebuild
@@ -1,19 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-1.99.3.ebuild,v 1.2 2007/09/01 19:55:26 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-1.99.3.ebuild,v 1.3 2007/09/01 21:58:33 nichoj Exp $
 
-inherit ruby gems
+inherit gems
 
-USE_RUBY="ruby18"
 DESCRIPTION="A distributed application deployment system"
 HOMEPAGE="http://capify.org/"
 SRC_URI="http://gems.rubyonrails.com/gems/${P}.gem"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
-#RESTRICT="test"
 
 DEPEND=">=dev-lang/ruby-1.8.2
 	>=dev-ruby/rake-0.7.0
diff --git a/dev-ruby/capistrano/capistrano-2.0.0.ebuild b/dev-ruby/capistrano/capistrano-2.0.0.ebuild
new file mode 100644
index 000000000000..82a456b59082
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-2.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/capistrano-2.0.0.ebuild,v 1.1 2007/09/01 21:58:33 nichoj Exp $
+
+inherit gems
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="http://capify.org/"
+SRC_URI="http://gems.rubyforge.org/gems/${P}.gem"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/ruby-1.8.2
+	>=dev-ruby/rake-0.7.0
+	>=dev-ruby/net-ssh-1.0.10
+	>=dev-ruby/net-sftp-1.1.0
+	>=dev-ruby/highline-1.2.7"
+PDEPEND="dev-ruby/capistrano-launcher"
+
+src_install() {
+	gems_src_install
+
+	# Deleted cap, as it will be provided by capistrano-launcher
+	rm "${D}/usr/bin/cap"
+	rm "${D}/${GEMSDIR}/bin/cap"
+}
diff --git a/dev-ruby/capistrano/files/digest-capistrano-1.4.1-r1 b/dev-ruby/capistrano/files/digest-capistrano-1.4.1-r1
new file mode 100644
index 000000000000..20d533180bd3
--- /dev/null
+++ b/dev-ruby/capistrano/files/digest-capistrano-1.4.1-r1
@@ -0,0 +1,3 @@
+MD5 c35b2863b5c9110dc0dff51e85ffac98 capistrano-1.4.1.gem 49152
+RMD160 f6ba17b610c039ed88db6bb5ae86bd21a61ad5bf capistrano-1.4.1.gem 49152
+SHA256 2ed5ec04a2492fa5a9f9dc9b613990c5866935a8c193a9476fd73b29c98a7313 capistrano-1.4.1.gem 49152
diff --git a/dev-ruby/capistrano/files/digest-capistrano-2.0.0 b/dev-ruby/capistrano/files/digest-capistrano-2.0.0
new file mode 100644
index 000000000000..749e9ec539fd
--- /dev/null
+++ b/dev-ruby/capistrano/files/digest-capistrano-2.0.0
@@ -0,0 +1,3 @@
+MD5 1e7cbfc6517cff98022409dd21aea6f1 capistrano-2.0.0.gem 84480
+RMD160 15c01d1a2313f7e0e7ac61dd5d415ad939ab5c1a capistrano-2.0.0.gem 84480
+SHA256 353dfe6868d6c2007d63b9f62e833581f0a839850d3646d90ca258e964cf2ad6 capistrano-2.0.0.gem 84480