Version bump (finally) with a patch to support Ruby 1.8 syntax for a while still.

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

4 files changed, 124 insertions, 9 deletions

diff --git a/dev-ruby/aws-sdk/ChangeLog b/dev-ruby/aws-sdk/ChangeLog
index e22037afd071..587473de4d35 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.10 2012/08/10 15:40:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/aws-sdk/ChangeLog,v 1.11 2012/10/02 01:29:04 flameeyes Exp $
+
+*aws-sdk-1.6.7 (02 Oct 2012)
+
+  02 Oct 2012; Diego E. Pettenò <flameeyes@gentoo.org> +aws-sdk-1.6.7.ebuild,
+  +files/aws-sdk-1.6.7.patch:
+  Version bump (finally) with a patch to support Ruby 1.8 syntax for a while
+  still.
 
 *aws-sdk-1.6.3 (10 Aug 2012)
 
diff --git a/dev-ruby/aws-sdk/Manifest b/dev-ruby/aws-sdk/Manifest
index cb96957f2a5b..e92b037d8246 100644
--- a/dev-ruby/aws-sdk/Manifest
+++ b/dev-ruby/aws-sdk/Manifest
@@ -3,19 +3,22 @@ Hash: SHA256
 
 AUX aws-sdk-1.5.3-disabletest.patch 1224 SHA256 b055af92a1b6ebca94c2050c465a61a55b477b9b3e00fdd81c9a428a6ebebe15 SHA512 b5eb60cb46052e0a23b0b2e697e5137272f477610ac48d6c95b25235fdd544e21ed8921202847f349698ace08539ed1b1401e7ebd7e43a5f92e94d990b06ccc2 WHIRLPOOL 9e17cbc3775cb8a5821a7b081c48363da40b98b70cf21c910fc82995db7c857605e7a0ab0d6d3d6468f62ce03b9a6aab6a6a4d0cc87baa1ac46c21680cc471ab
 AUX aws-sdk-1.6.3-no-simplecov.patch 1126 SHA256 a23b3898ea08f3cf5cd3ba4b8d0164af95cf351bc72790fc75bab9d84f7c5577 SHA512 70a9881fd838c89cffa150d7f4773d4ec516d37cf181f0dfb4655fb1abe8487c1f39776d4d3def1a6ef14c5ddcd9b701e4fa711ff695c387f6ef06c0a50ae0ac WHIRLPOOL 6ea5a79b0ad9a495db4d3ae65ef91736977fd3e18febe679d52d2d4cdb823a2346bf8d55d01a7e4531c605c4f5d5e486fb6b724bb1ff359610d03056dd84b5d4
+AUX aws-sdk-1.6.7.patch 1434 SHA256 665c1f4e783bc71aca5e6e94f546ef4ddba7431e6b6bc5e6703e77f9e0b49eec SHA512 f9b2f0c424f45c76124e9f0e3ed2515771fcebc4560ab77b141e66e6fab7690a21bb7b798e7024f499195fd60e82a8abe28a5427e9e6c24c92c33919d5000012 WHIRLPOOL 7e9d1f9791490375fcf211745f9fc66cca81d0ae81179eaed935dfdc385f190f7613548f2a0b5ccb63596f027606f0eaedac84a8177985d621a4314adff8c4f5
 AUX aws-sdk.gemspec 429 SHA256 cd4c7078dc55625309ab8b97f5de010693fa4d8db9b892c273adaaa07b665ccd SHA512 36421c4d6549dadc8fca61d861dcfc03f748627b59232e3982312b3ef72ad08dbbe6af5c3765b4a45d05e4f944a681f1fb0b6af8660668639edefb4a455d88bc WHIRLPOOL 3a0e159f90df5c201508f488d050532dbd6b856c6058db31760bc0bb1bcdb3984ca17d595641cdf2c86ff190a35ea06678e45ba247336a7cd1e8b9cd29645fc6
 DIST aws-sdk-for-ruby-1.6.3.tar.gz 1282646 SHA256 7285b30f504e357331e4a2e4bdfe5aa2e9903f752f1e9fa4e4385a39d3fbe550 SHA512 fceb4c28484c1546e81da2751e2e1d101ce9a2b9bd2ddbe23bb5c836c6f798153d0fbb65446d658237e5414819e72fdcad581741785ae3a578c2456c6ac058c4 WHIRLPOOL ded96885d16df8a45d6cf09ff217ccd616e1f568e45bdb40b9449e0ebf0e3238fccb842516a6316f954deb439aa0c772be5f76d60a898e963971f83eb0afcaff
+DIST aws-sdk-for-ruby-1.6.7.tar.gz 1301392 SHA256 87fe8b41034a1a05ffcd175bd37a6c9efe7212fae39ec790bf86acfc8f86c37e SHA512 45bba3a97aa0520ba067b86bc046a6fbdffb451bbd69e57c30d2894fb1e2a74106f328b56182494515507c0de3f8b5f89bfefc9c5a420e6afc792637fe507eb0 WHIRLPOOL 24c29bea3b58528b5b09a82874b1b3d02f641aea5a76f8261f733cc3a52add643668d592e41f6d88d7c23c0aad4d80776927a09bc1cb46224f14584e5c2bed9b
 EBUILD aws-sdk-1.6.3.ebuild 1374 SHA256 abf4c764688f5d58c95dd807e2f28ae9525b936f88e38a530aaa9fb051251b76 SHA512 e18e12185ef32b3088591314eb337e6d69c1379cbade8983dc53c709ebd668ef1099e0103e370b441daa5229682b4c92a0ce89d500842a97223a988b766f4015 WHIRLPOOL 2b2eef46cf3c915609167946511ee7a9560a22594f8c970a4e6ea6106d444e69ba2e1919a5016bb4946702fa49bf40a7cada85a4c8ab5310b70bc2c3d08f57ae
-MISC ChangeLog 2167 SHA256 4336c9d3f68ea046b9749360776cc6ff52fd23648da91f35128d4788de93d63c SHA512 c1f8b12a1973062b299764b67e5014ff4f97f14c5fd0c9d50d32b294c316df51775e001baf428b6f747d06c48aa9253c28fce92b40204817fb10ce6a6d0f7cdf WHIRLPOOL c91b6bcbeaa180b168cac23a37812a65431aea3a399399ce0a42d33c4ae950f520dfb6ddc1075480091a6cc221277da3d6c29fa9bb8ffe16be2852fbce2967c0
+EBUILD aws-sdk-1.6.7.ebuild 1354 SHA256 a695c0399b3183c9ef3e73558f3a73aae1e32009eb4e57375af271ffb86a81c3 SHA512 23dc235718c849ca13527d327058aed9ca58a58088f6e88ba1654461c17041d9cc566b6f926a2ceb91e7572bbc5ce98dcae94d814f588d9a7cc4f01f05653aa6 WHIRLPOOL 33123982fd6dc638558c462268a19da93b6389200034e31dc6eb4c57d630831e40961cf67e3187824db17009fce3e2fcf405d531435709fe5857c6330b7a3a0f
+MISC ChangeLog 2393 SHA256 4242b6d0dfc18446703e266d8a01163e915c9e47f30e982ad27395d17317ca2f SHA512 cb55d832567f4f95ed5c449d0dc3368ca240d94fddbf75f7b1c5649d9b8e3d01040f5cd6e18b8c25f47191002c22cedd8c421036ff33183b303599cb0e7c2549 WHIRLPOOL 7430c49b315d4b147338c37e626ce9d2d9fa62394f0771b188385b63db33bc8e9fed46f1d13cc804aa77d8ed5e3a63b71746ba2607c45c2dce7f7d05db2ecb89
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQJSufAAoJEBzRPIrUMBNCV/UIAIC7oq49BUEa1d91HVBC7jtn
-NzSVA2PLhhE+W/janNYKIQzId8Rp1J7TgRA7frOiZYpE3fQAZjUKLyEsLTwFi75w
-JefkMlG8J6PaclxVjWZMir4RaN308DOgsR7YmiLcgH3aRp9X4npuLFm1Kcd6iPjV
-pCvFu/5ek0ekPDsgnDap57itSLxJscdn2NH674Bwew3JawFaBN3gEXjQCXvxSzMK
-TIciib8QmSmrwrct+ZJ4MJZhFSodLFgo2qTihdHko74+lYqbTbpeu8UR6mr/UrQb
-06FK+KS6ed9fJZvoIX6QdR4ZtsqCVTTWn3kQgm3zCQse6ksyS+g7txZF5u4juVY=
-=Dq0j
+iQEcBAEBCAAGBQJQakOxAAoJEBzRPIrUMBNC2cQH/2kK3A+w/L8yz3euG7LiM4T7
+4cp6oU5omxx2x3VTaKCMZuBl09nUse5VH2AQsZO1/9pSlC4V9CFTN3RHd3oRim1f
+WhYvn/yn7ebKp91FffHbY2owp7Wv8Yj0R/kQqPBiD6sNBjZ/cUTDEo7haoUivsyL
+PDhM+3+sb1+3A794QxIzf6wDo6CLEMhZZQ2l7q4wQuo3IeCoLUFZNF3H3fJQaxX8
+ARcxZaBddC8Adb13/fs+qfN5Qb9GwkMhUYLsYK9cgqZ6LpALi9NFCKqa0lr3wQRl
+eKsxywGGRr3wPiVP5g/H4zTnL6pGSSX7hNgngv9eOcDP2GCgqT/+KMo1mei19oM=
+=IIIX
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/aws-sdk/aws-sdk-1.6.7.ebuild b/dev-ruby/aws-sdk/aws-sdk-1.6.7.ebuild
new file mode 100644
index 000000000000..c297756b13a8
--- /dev/null
+++ b/dev-ruby/aws-sdk/aws-sdk-1.6.7.ebuild
@@ -0,0 +1,60 @@
+# 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.7.ebuild,v 1.1 2012/10/02 01:29:04 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
+	${P}.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/files/aws-sdk-1.6.7.patch b/dev-ruby/aws-sdk/files/aws-sdk-1.6.7.patch
new file mode 100644
index 000000000000..c45ce320c97c
--- /dev/null
+++ b/dev-ruby/aws-sdk/files/aws-sdk-1.6.7.patch
@@ -0,0 +1,45 @@
+diff --git a/lib/aws/core/option_grammar.rb b/lib/aws/core/option_grammar.rb
+index bb612bb..8d00eff 100644
+--- a/lib/aws/core/option_grammar.rb
++++ b/lib/aws/core/option_grammar.rb
+@@ -11,7 +11,6 @@
+ # ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ 
+-require 'base64'
+ require 'bigdecimal'
+ require 'json'
+ 
+@@ -112,11 +111,11 @@ module AWS
+           end
+ 
+           def encode_value(value)
+-            Base64.strict_encode64(value.to_s)
++            [value.to_s].pack("m0").chomp
+           end
+ 
+           def hash_format(value)
+-            Base64.strict_encode64(value.to_s)
++            [value.to_s].pack("m0").chomp
+           end
+ 
+         end
+diff --git a/spec/aws/s3/client_spec.rb b/spec/aws/s3/client_spec.rb
+index 6ac80e1..f39a4a4 100644
+--- a/spec/aws/s3/client_spec.rb
++++ b/spec/aws/s3/client_spec.rb
+@@ -247,8 +247,12 @@ module AWS
+ 
+             request.http_method.should eq('PUT')
+             request.querystring.should eq('tagging')
+-            request.headers['content-md5'].should eq(client.send(:md5, xml))
+-            request.body.should eq(xml)
++
++            # the array is differently sorted on Ruby 1.8
++            unless RUBY_VERSION =~ /^1.8/
++              request.headers['content-md5'].should eq(client.send(:md5, xml))
++              request.body.should eq(xml)
++            end
+ 
+           end
+