Version bump; remove beta versions

Package-Manager: portage-2.1.3.9

8 files changed, 55 insertions, 91 deletions

diff --git a/dev-ruby/capistrano/ChangeLog b/dev-ruby/capistrano/ChangeLog
index 6e17820c0c6a..a2a5641e99ed 100644
--- a/dev-ruby/capistrano/ChangeLog
+++ b/dev-ruby/capistrano/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2007/09/06 14:44:19 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/capistrano/ChangeLog,v 1.22 2007/10/17 06:42:02 graaff Exp $
+
+*capistrano-2.1.0 (17 Oct 2007)
+
+  17 Oct 2007; Hans de Graaff <graaff@gentoo.org> -capistrano-1.99.1.ebuild,
+  -capistrano-1.99.3.ebuild, +capistrano-2.1.0.ebuild:
+  Version bump, remove beta versions.
 
 *capistrano-2.0.0 (01 Sep 2007)
 *capistrano-1.4.1-r1 (01 Sep 2007)
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index f55a00d17e63..286377cbdab4 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -2,9 +2,8 @@
 Hash: SHA1
 
 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
 DIST capistrano-2.0.0.gem 84480 RMD160 15c01d1a2313f7e0e7ac61dd5d415ad939ab5c1a SHA1 0aa567fe60a77c34acd4b48a74c2e46e8ac4b431 SHA256 353dfe6868d6c2007d63b9f62e833581f0a839850d3646d90ca258e964cf2ad6
+DIST capistrano-2.1.0.gem 91648 RMD160 17fbaf468bd383ef74d3f085f1406d13e12628b4 SHA1 a80e9a03e786f7bfe0b8240a109bf2422b2ec455 SHA256 6b2e6e5feac3243413bf23bb1875bf6f869d2ed7fd3e4e41f2b88438dd63eb0a
 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
@@ -13,22 +12,18 @@ EBUILD capistrano-1.4.1.ebuild 896 RMD160 15d1485d70b0fc356e330967d58eaeaf4ccbf7
 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 3354 RMD160 b37ead6d79e1683dab016fdaf9729cea8efb3841 SHA1 ea0a5323014246ab30a50a3eb55a2ddbbadd798c SHA256 6551c1efc83391443f89ab37ef7ee48439d49578514d5d502b8c07bb9a989b5f
-MD5 b94713397402124be69bb98ebb0c0601 ChangeLog 3354
-RMD160 b37ead6d79e1683dab016fdaf9729cea8efb3841 ChangeLog 3354
-SHA256 6551c1efc83391443f89ab37ef7ee48439d49578514d5d502b8c07bb9a989b5f ChangeLog 3354
+EBUILD capistrano-2.1.0.ebuild 768 RMD160 d8759a0e2f176f15d82be3bf7e69a5215cc643f7 SHA1 050eb4f7147bcdbb6d2d2bb1c4225085a1600670 SHA256 70d2e0ca3e4b78163740a87810233eb1e7f75eaaf3b9ba9cb3b26d259ea64f43
+MD5 579ad32b0f538e9abc5d9522fdb12177 capistrano-2.1.0.ebuild 768
+RMD160 d8759a0e2f176f15d82be3bf7e69a5215cc643f7 capistrano-2.1.0.ebuild 768
+SHA256 70d2e0ca3e4b78163740a87810233eb1e7f75eaaf3b9ba9cb3b26d259ea64f43 capistrano-2.1.0.ebuild 768
+MISC ChangeLog 3560 RMD160 38a5259dab23998866eaaa7ff989425c74708ebe SHA1 b2a67042d27463869ee42d0b9033da239e44792f SHA256 ce7165e5a7a867184b1e9205e5491506bb866549065d2e9287cd2a276cadd837
+MD5 81f1ab10761ed43d11cd74b5888ecf48 ChangeLog 3560
+RMD160 38a5259dab23998866eaaa7ff989425c74708ebe ChangeLog 3560
+SHA256 ce7165e5a7a867184b1e9205e5491506bb866549065d2e9287cd2a276cadd837 ChangeLog 3560
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -39,19 +34,16 @@ SHA256 e3cc176069e8d4255275851a25fd1f5cf147ed7c1a032309553dd5782855550c files/di
 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
+MD5 d2d039965007f4682dacc98ba3a89f3c files/digest-capistrano-2.1.0 238
+RMD160 f482157b49f13b33da7fac4928ca406177c2e5f0 files/digest-capistrano-2.1.0 238
+SHA256 7955709a78f5f5abf6f1993c65cb40ba49553f3d614ec8cca846daffb9d6a223 files/digest-capistrano-2.1.0 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG4BJ1V3J2n04EauwRAn5RAJ4nZZUZKtScyrRFUJkug6u34y97sACgrh/b
-MLRLvk4OfyQrYwgPo2I94l8=
-=bAYo
+iD8DBQFHFa7A0BM77Tkv120RAndoAJ0TUVp+zKixSDCc/jO+4Aq9Y+E0PwCgr4BV
+HDsuDmCEaq2OfP7GcmDMpf8=
+=IUoq
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/capistrano/capistrano-1.99.1.ebuild b/dev-ruby/capistrano/capistrano-1.99.1.ebuild
deleted file mode 100644
index 64818ad45230..000000000000
--- a/dev-ruby/capistrano/capistrano-1.99.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.3 2007/09/01 21:58:33 nichoj Exp $
-
-inherit gems
-
-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 ~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"
-
-pkg_postinst() {
-	elog "If you are upgrading from <capistrano-1.99, you should convert your"
-	elog "project. See http://capify.org/upgrade"
-	elog
-	elog "Capistrano has replaced switchtower due to naming issues.  If you"
-	elog "were previously using switchtower in your Rails apps, you need to"
-	elog "manually remove lib/tasks/switchtower.rake from them and then run"
-	elog "'cap -A .' in your project directory, making sure to keep deploy.rb"
-}
diff --git a/dev-ruby/capistrano/capistrano-1.99.3.ebuild b/dev-ruby/capistrano/capistrano-1.99.3.ebuild
deleted file mode 100644
index ea748f7e5cc7..000000000000
--- a/dev-ruby/capistrano/capistrano-1.99.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.3 2007/09/01 21:58:33 nichoj Exp $
-
-inherit gems
-
-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 ~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"
-
-pkg_postinst() {
-	elog "If you are upgrading from <capistrano-1.99, you should convert your"
-	elog "project. See http://capify.org/upgrade"
-	elog
-	elog "Capistrano has replaced switchtower due to naming issues.  If you"
-	elog "were previously using switchtower in your Rails apps, you need to"
-	elog "manually remove lib/tasks/switchtower.rake from them and then run"
-	elog "'cap -A .' in your project directory, making sure to keep deploy.rb"
-}
diff --git a/dev-ruby/capistrano/capistrano-2.1.0.ebuild b/dev-ruby/capistrano/capistrano-2.1.0.ebuild
new file mode 100644
index 000000000000..017a49ad4174
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-2.1.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.1.0.ebuild,v 1.1 2007/10/17 06:42:02 graaff 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.99.1 b/dev-ruby/capistrano/files/digest-capistrano-1.99.1
deleted file mode 100644
index 33c52bb79044..000000000000
--- a/dev-ruby/capistrano/files/digest-capistrano-1.99.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e068bb67ce44d3da86c3475e0f360955 capistrano-1.99.1.gem 77312
-RMD160 fa31dd91ae15df999be933472a8a4506105a8bcf capistrano-1.99.1.gem 77312
-SHA256 6023db6a39a3b2c1e860efdeb2313c4aca9003ba331970bbb5a5ae8d315ae6ac capistrano-1.99.1.gem 77312
diff --git a/dev-ruby/capistrano/files/digest-capistrano-1.99.3 b/dev-ruby/capistrano/files/digest-capistrano-1.99.3
deleted file mode 100644
index 7672d94e61b4..000000000000
--- a/dev-ruby/capistrano/files/digest-capistrano-1.99.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aea1b96fd01d89fd1d25c394d49cab92 capistrano-1.99.3.gem 83456
-RMD160 7324941e17fa4de997aa7afc1c0343c78fd6fa2c capistrano-1.99.3.gem 83456
-SHA256 3a2bb85ab4a207a3097b3e9ec26d1fc966fd2c2dfcf8c628c6765234558220d1 capistrano-1.99.3.gem 83456
diff --git a/dev-ruby/capistrano/files/digest-capistrano-2.1.0 b/dev-ruby/capistrano/files/digest-capistrano-2.1.0
new file mode 100644
index 000000000000..04ddc05b954a
--- /dev/null
+++ b/dev-ruby/capistrano/files/digest-capistrano-2.1.0
@@ -0,0 +1,3 @@
+MD5 68bb541a4622840e5b068bffe02e9c78 capistrano-2.1.0.gem 91648
+RMD160 17fbaf468bd383ef74d3f085f1406d13e12628b4 capistrano-2.1.0.gem 91648
+SHA256 6b2e6e5feac3243413bf23bb1875bf6f869d2ed7fd3e4e41f2b88438dd63eb0a capistrano-2.1.0.gem 91648