Version bump; remove beta versions

(Portage version: 2.1.3.9)

7 files changed, 39 insertions, 67 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/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