Remove old; fix wrong LICENSE variable; use the new rspec test support.

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

6 files changed, 10 insertions, 194 deletions

diff --git a/dev-ruby/aws-sdk/ChangeLog b/dev-ruby/aws-sdk/ChangeLog
index 0e5a607388e7..79abc4b4dcf0 100644
--- a/dev-ruby/aws-sdk/ChangeLog
+++ b/dev-ruby/aws-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2012/06/30 21:12:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/ChangeLog,v 1.4 2012/07/05 21:36:58 flameeyes Exp $
+
+  05 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> -aws-sdk-1.5.3.ebuild,
+  -aws-sdk-1.5.5.ebuild, -files/aws-sdk-1.5.3+httparty-0.8.patch,
+  -files/aws-sdk-1.5.3.gemspec, aws-sdk-1.5.6.ebuild:
+  Remove old; fix wrong LICENSE variable; use the new rspec test support.
 
 *aws-sdk-1.5.6 (30 Jun 2012)
 
diff --git a/dev-ruby/aws-sdk/aws-sdk-1.5.3.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.5.3.ebuild
deleted file mode 100644
index 0d0276ccb36d..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-1.5.3.ebuild
+++ /dev/null
@@ -1,63 +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.5.3.ebuild,v 1.1 2012/06/15 14:46:52 flameeyes Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_TEST=""
-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="${FILESDIR}/${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="APSL-2"
-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_add_bdepend "
-	test? ( dev-ruby/rspec )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-
-	epatch "${FILESDIR}"/${P}+httparty-0.8.patch
-	epatch "${FILESDIR}"/${P}-disabletest.patch
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -S rspec -Ilib -raws || die
-}
-
-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.5.5.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.5.5.ebuild
deleted file mode 100644
index 17baab254798..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-1.5.5.ebuild
+++ /dev/null
@@ -1,67 +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.5.5.ebuild,v 1.1 2012/06/27 10:43:37 flameeyes Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 ree18"
-
-RUBY_FAKEGEM_TASK_TEST=""
-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="APSL-2"
-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_add_bdepend "
-	test? ( dev-ruby/rspec )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-
-	epatch "${FILESDIR}"/${PN}-1.5.3-disabletest.patch
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -S rspec -Ilib -raws || die
-}
-
-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.5.6.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.5.6.ebuild
index acac42ff9845..788e83842090 100644
--- a/dev-ruby/aws-sdk/aws-sdk-1.5.6.ebuild
+++ b/dev-ruby/aws-sdk/aws-sdk-1.5.6.ebuild
@@ -1,12 +1,12 @@
 # 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.5.6.ebuild,v 1.1 2012/06/30 21:12:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/aws-sdk-1.5.6.ebuild,v 1.2 2012/07/05 21:36:58 flameeyes Exp $
 
 EAPI=4
 
 USE_RUBY="ruby18 ruby19 ree18"
 
-RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
@@ -25,7 +25,7 @@ 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="APSL-2"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
@@ -35,12 +35,8 @@ ruby_add_rdepend "virtual/ruby-ssl
 	>=dev-ruby/json-1.4
 	>=dev-ruby/nokogiri-1.4.4
 	>=dev-ruby/uuidtools-2.1"
-ruby_add_bdepend "
-	test? ( dev-ruby/rspec )"
 
 all_ruby_prepare() {
-	rm Gemfile* || die
-
 	epatch "${FILESDIR}"/${PN}-1.5.3-disabletest.patch
 }
 
@@ -51,7 +47,7 @@ all_ruby_compile() {
 }
 
 each_ruby_test() {
-	${RUBY} -S rspec -Ilib -raws || die
+	ruby-ng_rspec -Ilib -raws
 }
 
 each_ruby_install() {
diff --git a/dev-ruby/aws-sdk/files/aws-sdk-1.5.3+httparty-0.8.patch b/dev-ruby/aws-sdk/files/aws-sdk-1.5.3+httparty-0.8.patch
deleted file mode 100644
index 9101dd527b39..000000000000
--- a/dev-ruby/aws-sdk/files/aws-sdk-1.5.3+httparty-0.8.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 40d0d8c581026ad07bf94897b974b05d6b0542ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Fri, 15 Jun 2012 06:21:04 -0700
-Subject: [PATCH] httparty_handler: do not dereference a nil object.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This might be required to support httparty 0.8 (which is in the
-dependencies as it is).
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- lib/aws/core/http/httparty_handler.rb |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/lib/aws/core/http/httparty_handler.rb b/lib/aws/core/http/httparty_handler.rb
-index 46b3c9c..f2fea30 100644
---- a/lib/aws/core/http/httparty_handler.rb
-+++ b/lib/aws/core/http/httparty_handler.rb
-@@ -92,12 +92,13 @@ module AWS
-   
-           begin
-             http_response = self.class.send(method, url, opts)
-+            unless http_response.nil?
-+              response.body = http_response.body
-+              response.status = http_response.code.to_i
-+              response.headers = http_response.to_hash
-+            end
-           rescue Timeout::Error, Errno::ETIMEDOUT => e
-             response.timeout = true
--          else
--            response.body = http_response.body
--            response.status = http_response.code.to_i
--            response.headers = http_response.to_hash
-           end
-         end
-       end
--- 
-1.7.8.6
-
diff --git a/dev-ruby/aws-sdk/files/aws-sdk-1.5.3.gemspec b/dev-ruby/aws-sdk/files/aws-sdk-1.5.3.gemspec
deleted file mode 100644
index a812d791edde..000000000000
--- a/dev-ruby/aws-sdk/files/aws-sdk-1.5.3.gemspec
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "aws-sdk"
-  s.version = "1.5.3"
-  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