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

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

7 files changed, 26 insertions, 202 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/Manifest b/dev-ruby/aws-sdk/Manifest
index 156787268661..30f844835277 100644
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@@ -1,12 +1,20 @@
-AUX aws-sdk-1.5.3+httparty-0.8.patch 1461 SHA256 bc97780e3b18b1277a94039a4c8062c6193c7f2430067faa5bf1358bde0d9d61 SHA512 eac1a37796c2b999efa72f6cc822be62a6525be01f7383091e7d62d71e63fc7afebe92e18010656060ea4b66965b54ecddf0329c154aaadc20e9238d7a1da82c WHIRLPOOL e38514cc2b98c2ba34faa61bba24775aed3e194b37f9bf73e3cc3608e8476dd80318a3b86573a4f63cd997e6710e16ed3e5ed3b5d476417f4e4ee9dc769eee89
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX aws-sdk-1.5.3-disabletest.patch 1224 SHA256 b055af92a1b6ebca94c2050c465a61a55b477b9b3e00fdd81c9a428a6ebebe15 SHA512 b5eb60cb46052e0a23b0b2e697e5137272f477610ac48d6c95b25235fdd544e21ed8921202847f349698ace08539ed1b1401e7ebd7e43a5f92e94d990b06ccc2 WHIRLPOOL 9e17cbc3775cb8a5821a7b081c48363da40b98b70cf21c910fc82995db7c857605e7a0ab0d6d3d6468f62ce03b9a6aab6a6a4d0cc87baa1ac46c21680cc471ab
-AUX aws-sdk-1.5.3.gemspec 427 SHA256 ae036e5816fb24dedcd89ba37f1657d14a3d45980f8059bb4043eb05f80712ef SHA512 b12d84454b2d35430f34fae5390fb86b106ce32ab22217d8504d26fd6ecfb6f74881ecb7930a8192246e0e950b4835af33aaaa8a8e559394d0a993e377a0dbb8 WHIRLPOOL 35bb4da61bd725d8cfd26859b1a6867b95fb8f21e81d855a1ee1551ddaf79f4029acc98b570992bc721855e5653b2926789908762d70f88c836aea4aff1f14f5
 AUX aws-sdk.gemspec 429 SHA256 cd4c7078dc55625309ab8b97f5de010693fa4d8db9b892c273adaaa07b665ccd SHA512 36421c4d6549dadc8fca61d861dcfc03f748627b59232e3982312b3ef72ad08dbbe6af5c3765b4a45d05e4f944a681f1fb0b6af8660668639edefb4a455d88bc WHIRLPOOL 3a0e159f90df5c201508f488d050532dbd6b856c6058db31760bc0bb1bcdb3984ca17d595641cdf2c86ff190a35ea06678e45ba247336a7cd1e8b9cd29645fc6
-DIST aws-sdk-for-ruby-1.5.3.tar.gz 1217280 SHA256 ba07a5cd2f43c82f9490d58170dc5cd94f978ee5c5bf80ad80ed2ba809312674 SHA512 dedaea500f040a5a7c195e6d2893e271abe1290cda66f47201454a3ae3fee2d1bf0f3606b522f580582b1df7b769662e1c616559fe6a7722968d826182c51fe4 WHIRLPOOL 63c4bd25d28290eba6722247cade0af036e2d153d95f179c4bf1b7ce8ff03167a279256a8a2f9a9f1f3128f7c38d019922e3e45e91be7d49809728dff0b23b5c
-DIST aws-sdk-for-ruby-1.5.5.tar.gz 1220303 SHA256 74601b64f767dba9e72247c4b48572f01f1e955cc5a52a176424d96c22a98891 SHA512 7f11b30bcc18d2933da72ddb9a2e0b4c7b64b5aff737f9c5560daa41efa48bef4d7e5e9c0e2e08f491c5cef3fe50c4d1d86cb2c5f764815dac78f72739b5ba35 WHIRLPOOL 8889a257b4e0cdec6812f02e0790e30bd021c91ce9810202ad0b80cf4526cc68c7930761ee81c21d1352989dd21ea2f354502811662713ebc06811bd9e0d0e2e
 DIST aws-sdk-for-ruby-1.5.6.tar.gz 1220994 SHA256 55ae6fb3434e825891a8fd73a5012bb0f31e98a474ba79b765bf1a414b00afc8 SHA512 1b2787524fbe65c8f89b10d10d4a61faef6919d015722e127d855d5498b4c9fd6140c1c0343f74a32e023713bc406740c3fd4465519477cb5114050137195b99 WHIRLPOOL af9f83ca8be8cf52d255e4d739f53aaacfb103b17842c4fdc7927df8994ba59d0a3a60f7977624766fad92694370da53b27cb0509f81b9124a0b9a7a81857aa9
-EBUILD aws-sdk-1.5.3.ebuild 1400 SHA256 7216527f1414f5ef0e8455b91bac1d2c310c774b512c4a859cb439eff416a9a7 SHA512 a83605e0b851bd8d329a47f1a93f77ebb3889444b3a6991734c54f281b3cfa4b21b22bcb90404ee98f764e71fcbbc9aef81aedc674bebe7e94340a8c9126415f WHIRLPOOL 0736dd0a5b20f63f9eff77faaf32fd5c89ad13a81d7895013cc5279049d3fe11828a18120c3663316d00d350571b677557945b4f7de5d346db8e18814c546c5a
-EBUILD aws-sdk-1.5.5.ebuild 1484 SHA256 c4b24345c56e2f7f6d681d8620ec320f90830b00ce824921b4f494ff27566de4 SHA512 03afe249a74b506933b768c4ad0dd2d2b09fa826af065be7fef95aefe9f60125521b4dda8f44941eed6042f981aa15e5cf8bd6b910c9049a79558205c9dae310 WHIRLPOOL 938da73b8105adbb54157abccb008c992b066289f3d0604ad90322be3c8423221c8791d113d1c710d024bb250622b43e3dcc0a8db26ea1cd10130d77f8cfe45a
-EBUILD aws-sdk-1.5.6.ebuild 1484 SHA256 d8dc1ab4feb31c92824e7e8862519abc80d870ee74930e149713c42118e58272 SHA512 87480d1c68b8e1e21f9d4a7a3a7ef7b354b73aa1c1f4522816971e4e7dcc993902ad29dc11b248325126b6e2cff74dd38f0df35a30265454de73cba144276a85 WHIRLPOOL a7fc9760274b4179f7eb2abc38ebc58a66cb144d0b4b3623a7ca5a978a9d7ad99cb68e40d2c5a20270819093fdbaded1470d2cc86c570cca6e9313153d04e99f
-MISC ChangeLog 779 SHA256 ea4c8e31c8a8252a30ed07e0ef6de6ed66cd1839fdd59864b50bbc95aae0206b SHA512 59e8e6d9e1260b314d34af16dbd52c6cf5d3c9b1142ef2c0fbee373929f29d9db666da3e3b710c44c1978bc701be5dc1832bffbd7680ff05177cea449c0aa580 WHIRLPOOL 628c7118f96252c7c3631a6df0f5bee9247b4f52fc8389ece84630c13aac4f061637e181dbc2d5cca34c338425d731951d2327bf56584ca258e3b423fecf9671
+EBUILD aws-sdk-1.5.6.ebuild 1418 SHA256 ff3ef02965bc23a35066470c97b25a566474a5a5b580461540c269a30fa7530e SHA512 f6b925cd45ffa83206c08dc82d22686e5f141d4b863dc3234f1d3cae3dacfd6bfff1b6879ff85827017e3c691756cadf28ac8f26395243a656c8bb4b8ac9d906 WHIRLPOOL f7b576af0ef02ca02fc4ebf7a1d08d400da5f4377f5cbac582dfb05de1817f9bd8c9300c091c46efcc58888bbe8b177d71199bbd0cc42d44b46ad2c950ca059c
+MISC ChangeLog 1053 SHA256 865fe8a99a06f6611e9188b27f0791479ff9654a25dbc397162ccdfcf6cd3cc3 SHA512 8787b9b95fa8db6a12ab750282571316cbf348b5ffe25b555147f789931d39f58c998b30d44ca7368a66d8d71db0c4cc3102d7e5c7786c6bc011259b18f0b964 WHIRLPOOL ef58b7a6cf8611c0d1bd2990e05bd5f6f0db20c1afae6f02b94ca417b058cfdc1e0e712de20465e96e8e693f80327ec2c4ec97f806f00e1bc49ea8fca4272af7
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP9gkGAAoJEBzRPIrUMBNCnIQIAJnTXlCrDmNotQyPm1FUjCj6
+vyyMKmRaemh3QLBVuvEmNcxWvs72zGJcYa23xu6u+t6Dne+smF0DqzjT1JyZypiX
+v4vlp/BfNsC7fMS0JvIEwb027IFGBgpAxgP5MxBU6E9HkfhjHJ03RNbPP6Zcm+9g
+/27RsOwd0jXDJs5qliu6lEqddyRBmZmAs0j6jx1wkp/+p75U9F3rM9eVnmbsBs+E
+NI2vedYF8QsC0CibJJAV3VsgSwkt4nW8LUo1FgnXF5x6AI8qzj3S41ap6amC/aeA
+bbh/qrNUOWac5qRpM4H/Tpxlj9QpHYLorSZEsxocep103/VS2uXhocaEUAX827Q=
+=FSQS
+-----END PGP SIGNATURE-----
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