Version bump; remove old; remove gemspec as now they ship with one.

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

5 files changed, 12 insertions, 118 deletions

diff --git a/dev-ruby/aws-sdk/ChangeLog b/dev-ruby/aws-sdk/ChangeLog
index e8010b6b32b6..47bd55de3241 100644
--- a/dev-ruby/aws-sdk/ChangeLog
+++ b/dev-ruby/aws-sdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/aws-sdk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/ChangeLog,v 1.13 2012/10/02 20:52:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/ChangeLog,v 1.14 2012/10/05 06:09:40 flameeyes Exp $
+
+*aws-sdk-1.6.9 (05 Oct 2012)
+
+  05 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> +aws-sdk-1.6.9.ebuild,
+  -aws-sdk-1.6.3.ebuild, -aws-sdk-1.6.8.ebuild,
+  -files/aws-sdk-1.6.3-no-simplecov.patch, -files/aws-sdk.gemspec:
+  Version bump; remove old; remove gemspec as now they ship with one.
 
 *aws-sdk-1.6.8 (02 Oct 2012)
 
diff --git a/dev-ruby/aws-sdk/aws-sdk-1.6.3.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.6.3.ebuild
deleted file mode 100644
index 0c615eaf1983..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-1.6.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.6.3.ebuild,v 1.1 2012/08/10 15:40:58 flameeyes Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ca-bundle.crt"
-
-GITHUB_USER="amazonwebservices"
-GITHUB_PROJECT="${PN}-for-ruby"
-RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-RUBY_FAKEGEM_GEMSPEC="${T}/${P}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Official SDK for Amazon Web Services"
-HOMEPAGE="http://aws.amazon.com/sdkforruby"
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/tarball/${PV} -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl
-	>=dev-ruby/httparty-0.7
-	>=dev-ruby/json-1.4
-	>=dev-ruby/nokogiri-1.4.4
-	>=dev-ruby/uuidtools-2.1"
-
-RUBY_PATCHES=(
-	${PN}-1.5.3-disabletest.patch
-	${PN}-1.6.3-no-simplecov.patch
-)
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc || die
-	fi
-}
-
-each_ruby_install() {
-	sed -e "s:VERSION:${PV}:" "${FILESDIR}"/${PN}.gemspec > "${RUBY_FAKEGEM_GEMSPEC}"
-	each_fakegem_install
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r recipebook samples
-}
diff --git a/dev-ruby/aws-sdk/aws-sdk-1.6.8.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.6.9.ebuild
index 5caeb8c62255..577f362f158c 100644
--- a/dev-ruby/aws-sdk/aws-sdk-1.6.8.ebuild
+++ b/dev-ruby/aws-sdk/aws-sdk-1.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.6.8.ebuild,v 1.1 2012/10/02 20:52:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.6.9.ebuild,v 1.1 2012/10/05 06:09:40 flameeyes Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ GITHUB_USER="amazonwebservices"
 GITHUB_PROJECT="${PN}-for-ruby"
 RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
 
-RUBY_FAKEGEM_GEMSPEC="${T}/${P}.gemspec"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
 inherit ruby-fakegem
 
@@ -40,9 +40,8 @@ RUBY_PATCHES=(
 	${PN}-1.5.3-disabletest.patch
 )
 
-each_ruby_install() {
-	sed -e "s:VERSION:${PV}:" "${FILESDIR}"/${PN}.gemspec > "${RUBY_FAKEGEM_GEMSPEC}"
-	each_fakegem_install
+all_ruby_prepare() {
+	sed -i -e 's:~>:>=:' "${RUBY_FAKEGEM_GEMSPEC}" || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/aws-sdk/files/aws-sdk-1.6.3-no-simplecov.patch b/dev-ruby/aws-sdk/files/aws-sdk-1.6.3-no-simplecov.patch
deleted file mode 100644
index 2c438473b88e..000000000000
--- a/dev-ruby/aws-sdk/files/aws-sdk-1.6.3-no-simplecov.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d507e8f8a03e4a5e517d1b6cad9b1a7a8dbbd7f6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Fri, 10 Aug 2012 08:28:06 -0700
-Subject: [PATCH] spec: do not force simplecov presence.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-For Gentoo packaging for instance we don't want to know how much of
-the code is covered by the tests, we just want to make sure that the
-tests pass properly.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- spec/spec_helper.rb |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 0214460..8001b3a 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -11,8 +11,11 @@
- # ANY KIND, either express or implied. See the License for the specific
- # language governing permissions and limitations under the License.
- 
--require 'simplecov'
--SimpleCov.start
-+begin
-+  require 'simplecov'
-+  SimpleCov.start
-+rescue LoadError
-+end
- 
- $: << File.join(File.dirname(File.dirname(__FILE__)), "lib")
- 
--- 
-1.7.8.6
-
diff --git a/dev-ruby/aws-sdk/files/aws-sdk.gemspec b/dev-ruby/aws-sdk/files/aws-sdk.gemspec
deleted file mode 100644
index 6b917d326f31..000000000000
--- a/dev-ruby/aws-sdk/files/aws-sdk.gemspec
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "aws-sdk"
-  s.version = "VERSION"
-  s.homepage = "http://aws.amazon.com/sdkforruby"
-  s.require_paths = ["lib"]
-  s.summary = "AWS SDK for Ruby"
-
-  s.add_runtime_dependency(%q<uuidtools>, [">= 2.1"])
-  s.add_runtime_dependency(%q<httparty>, [">= 0.7"])
-  s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.4"])
-  s.add_runtime_dependency(%q<json>, [">= 1.4"])
-end