Version bump; cleanup old versions; use new syntax.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 17 insertions, 91 deletions

diff --git a/dev-ruby/amazon-ec2/ChangeLog b/dev-ruby/amazon-ec2/ChangeLog
index 18fd7db5c937..fc1909aa2b20 100644
--- a/dev-ruby/amazon-ec2/ChangeLog
+++ b/dev-ruby/amazon-ec2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/amazon-ec2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/ChangeLog,v 1.6 2010/04/26 18:59:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/ChangeLog,v 1.7 2010/05/23 22:50:59 flameeyes Exp $
+
+*amazon-ec2-0.9.14 (23 May 2010)
+
+  23 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -amazon-ec2-0.9.4.ebuild, -amazon-ec2-0.9.10.ebuild,
+  -amazon-ec2-0.9.12.ebuild, +amazon-ec2-0.9.14.ebuild:
+  Version bump; cleanup old versions; use new syntax.
 
   26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   amazon-ec2-0.9.12.ebuild:
diff --git a/dev-ruby/amazon-ec2/amazon-ec2-0.9.10.ebuild b/dev-ruby/amazon-ec2/amazon-ec2-0.9.10.ebuild
deleted file mode 100644
index 02b9622336c7..000000000000
--- a/dev-ruby/amazon-ec2/amazon-ec2-0.9.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.10.ebuild,v 1.1 2010/04/04 18:24:59 flameeyes Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README_dev.rdoc ChangeLog"
-
-RUBY_FAKEGEM_BINWRAP="ec2sh"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for accessing the Amazon Web Services EC2 and related"
-HOMEPAGE="http://github.com/grempe/amazon-ec2"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# We only need yard for Ruby 1.8, as we use it for documentation
-# generation.
-USE_RUBY=ruby18 \
-	ruby_add_bdepend doc "dev-ruby/yard"
-
-ruby_add_bdepend test "virtual/ruby-test-unit >=dev-ruby/test-spec-0.10.0 >=dev-ruby/mocha-0.9.8"
-ruby_add_rdepend '>=dev-ruby/xml-simple-1.0.12'
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby19)
-			;;
-		*)
-			# Remove the reference to test-unit gem, since it's only
-			# available on Ruby 1.9.
-			sed -i -e '/^gem/s:^:#:' test/test_helper.rb || die
-			;;
-	esac
-}
diff --git a/dev-ruby/amazon-ec2/amazon-ec2-0.9.12.ebuild b/dev-ruby/amazon-ec2/amazon-ec2-0.9.14.ebuild
index 8b7e89d43cee..2f392e34026b 100644
--- a/dev-ruby/amazon-ec2/amazon-ec2-0.9.12.ebuild
+++ b/dev-ruby/amazon-ec2/amazon-ec2-0.9.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.12.ebuild,v 1.2 2010/04/26 18:59:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.14.ebuild,v 1.1 2010/05/23 22:50:59 flameeyes Exp $
 
 EAPI=2
 
@@ -25,9 +25,14 @@ IUSE=""
 # We only need yard for Ruby 1.8, as we use it for documentation
 # generation.
 USE_RUBY=ruby18 \
-	ruby_add_bdepend doc "dev-ruby/yard"
-
-ruby_add_bdepend test "virtual/ruby-test-unit >=dev-ruby/test-spec-0.10.0 >=dev-ruby/mocha-0.9.8"
+	ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+ruby_add_bdepend "
+	test? (
+		virtual/ruby-test-unit
+		>=dev-ruby/test-spec-0.10.0
+		>=dev-ruby/mocha-0.9.8
+	)"
 ruby_add_rdepend '>=dev-ruby/xml-simple-1.0.12'
 
 each_ruby_prepare() {
diff --git a/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild b/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild
deleted file mode 100644
index 67e2977e85c0..000000000000
--- a/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.4.ebuild,v 1.2 2010/02/13 19:15:52 flameeyes Exp $
-
-EAPI=2
-
-USE_RUBY="ruby18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc README_dev.rdoc ChangeLog"
-
-RUBY_FAKEGEM_BINWRAP="ec2sh"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for accessing the Amazon Web Services EC2 and related"
-HOMEPAGE="http://github.com/grempe/amazon-ec2"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# We only need yard for Ruby 1.8, as we use it for documentation
-# generation.
-USE_RUBY=ruby18 \
-	ruby_add_bdepend doc "dev-ruby/yard"
-
-ruby_add_bdepend test "virtual/ruby-test-unit dev-ruby/test-spec dev-ruby/mocha"
-ruby_add_rdepend '>=dev-ruby/xml-simple-1.0.12'
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby19)
-			;;
-		*)
-			# Remove the reference to test-unit gem, since it's only
-			# available on Ruby 1.9.
-			sed -i -e '/^gem/s:^:#:' test/test_helper.rb || die
-			;;
-	esac
-}