Version bump, remove old. This adds a patch to make simplecov optional.

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

6 files changed, 51 insertions, 186 deletions

diff --git a/dev-ruby/aws-sdk/ChangeLog b/dev-ruby/aws-sdk/ChangeLog
index cd5ccf20faa9..e22037afd071 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.9 2012/08/08 21:02:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/ChangeLog,v 1.10 2012/08/10 15:40:58 flameeyes Exp $
+
+*aws-sdk-1.6.3 (10 Aug 2012)
+
+  10 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +aws-sdk-1.6.3.ebuild,
+  +files/aws-sdk-1.6.3-no-simplecov.patch, -aws-sdk-1.5.6.ebuild,
+  -aws-sdk-1.5.8.ebuild, -aws-sdk-1.6.0.ebuild, -aws-sdk-1.6.2.ebuild:
+  Version bump, remove old. This adds a patch to make simplecov optional.
 
 *aws-sdk-1.6.2 (08 Aug 2012)
 
diff --git a/dev-ruby/aws-sdk/aws-sdk-1.5.6.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.5.6.ebuild
deleted file mode 100644
index 788e83842090..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-1.5.6.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.6.ebuild,v 1.2 2012/07/05 21:36: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"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.3-disabletest.patch
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc || die
-	fi
-}
-
-each_ruby_test() {
-	ruby-ng_rspec -Ilib -raws
-}
-
-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.8.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.5.8.ebuild
deleted file mode 100644
index af2d6df0459d..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-1.5.8.ebuild
+++ /dev/null
@@ -1,59 +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.8.ebuild,v 1.1 2012/07/27 01:29:46 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"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.3-disabletest.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.2.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.6.2.ebuild
deleted file mode 100644
index 7061d2ad5c62..000000000000
--- a/dev-ruby/aws-sdk/aws-sdk-1.6.2.ebuild
+++ /dev/null
@@ -1,59 +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.2.ebuild,v 1.1 2012/08/08 21:02:36 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"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.3-disabletest.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.0.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.6.3.ebuild
index 7f51a30a3f77..0c615eaf1983 100644
--- a/dev-ruby/aws-sdk/aws-sdk-1.6.0.ebuild
+++ b/dev-ruby/aws-sdk/aws-sdk-1.6.3.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.0.ebuild,v 1.1 2012/07/31 00:10:19 flameeyes Exp $
+# $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
 
@@ -36,9 +36,10 @@ ruby_add_rdepend "virtual/ruby-ssl
 	>=dev-ruby/nokogiri-1.4.4
 	>=dev-ruby/uuidtools-2.1"
 
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.3-disabletest.patch
-}
+RUBY_PATCHES=(
+	${PN}-1.5.3-disabletest.patch
+	${PN}-1.6.3-no-simplecov.patch
+)
 
 all_ruby_compile() {
 	if use doc; then
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
new file mode 100644
index 000000000000..2c438473b88e
--- /dev/null
+++ b/dev-ruby/aws-sdk/files/aws-sdk-1.6.3-no-simplecov.patch
@@ -0,0 +1,38 @@
+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
+