Fix building with USE=doc (remove bundler reference from all copies); fix tests with...

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

diff --git a/dev-ruby/amazon-ec2/ChangeLog b/dev-ruby/amazon-ec2/ChangeLog
index 422a739dbb4ee3c50e9ce65c0df22a786113c997..685d0ea2b6aa32462e21b0bf7bbff13b84fe0876 100644 (file)
--- a/dev-ruby/amazon-ec2/ChangeLog
+++ b/dev-ruby/amazon-ec2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/amazon-ec2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/ChangeLog,v 1.10 2011/07/21 10:00:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/ChangeLog,v 1.11 2011/08/07 00:14:46 flameeyes Exp $
+
+  07 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  amazon-ec2-0.9.17.ebuild, +files/amazon-ec2-0.9.17+ruby-1.9.2.patch:
+  Fix building with USE=doc (remove bundler reference from all copies); fix
+  tests with Ruby 1.9.2; add missing ruby-ssl dependency; use test-unit-2 as
+  that's what upstream seems to prefer.
 
 *amazon-ec2-0.9.17 (21 Jul 2011)
 

diff --git a/dev-ruby/amazon-ec2/Manifest b/dev-ruby/amazon-ec2/Manifest
index 5f79610f53d9e3b5a6689126ccdd8602a89a3249..69ec5c5359f61cd7b30dcf19e5e4edec15859cb4 100644 (file)
--- a/dev-ruby/amazon-ec2/Manifest
+++ b/dev-ruby/amazon-ec2/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX amazon-ec2-0.9.17+ruby-1.9.2.patch 10145 RMD160 079601927e2fa26600a72791bd856cbd193b5b8b SHA1 e0cc35bdf40ddaa158499a7abfc40ffb75f3e42d SHA256 99dfd8136af12e2f535b956618f914c55754ebb54ca67202eafcc3feef77d436
 DIST amazon-ec2-0.9.15.gem 128512 RMD160 fe4e64bfcd74611a0291a072daf2d5f6896a9fd2 SHA1 32ae84a576044022483df08b6f50b5be741814c2 SHA256 c2ca7cccdc68f9b8b569933312836e0d9e6206591bdc0a4f6ff9091c8df0b069
 DIST amazon-ec2-0.9.17.gem 124416 RMD160 06308b0d9a92772d010ffdaad80b41442be8011f SHA1 5960f8939c08fbc6fd1adec8b787a6716dca6790 SHA256 4cbbd8cada5534cc6d081281b26bbb777c53410ea571829d0b7d0826b7d1e971
 EBUILD amazon-ec2-0.9.15.ebuild 1164 RMD160 6e031fd29975b9d9cf01bfd9274445f7184b642e SHA1 1bf8bcd5d8f98bd35365aa0fdcd19240a9297ab6 SHA256 92de69dc179deb1966ceb9972b29736d26e47941976b806b6da3118a9fe83a19
-EBUILD amazon-ec2-0.9.17.ebuild 1251 RMD160 6141c44f8ed1e2bab833c67d05b9a2a060b7e46e SHA1 088d96966bd720c124b26d9231dcfe3030784c15 SHA256 6b8910097930d4277192462b28d1afd645fbec65a391ac7b0ccaf1d8ecbc42ae
-MISC ChangeLog 2035 RMD160 2970f61defe27bd254af35ed0182bfadf48224cd SHA1 e5b58aeb01d5d1285aa8604bc4c1f43e9bf2208f SHA256 cbc53c444477938c64a66cb259c7d72d657f2b11bbe4f8f8b73cfaef85497567
+EBUILD amazon-ec2-0.9.17.ebuild 1121 RMD160 19186aafec375105b132982c19b9dd1d375706bd SHA1 787e71cfb62b1dd5ce877592e2a0411af387c88b SHA256 8eca8f846654714629f19365c233b5c0b2aafa736aa7f10226834d72d09c0102
+MISC ChangeLog 2359 RMD160 9b638f808d247e2d1ef2198f5a88fd64fc17b7e1 SHA1 d526809d86abdc7c952094f37509d6aa74551dee SHA256 0d42d31f93d7a3b55d5c8a1c81f6ee88b2e89fd5afddd95c1f39867e26e0845b
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4n+NAACgkQiIP6VqMIqNdqBQD/Tjva8rDvQunCp1CzJChiLI0O
-VbwoOmbJV/8pDkM+QP8A/ROl+/HiMSvat72t6lVe99N02ekgU2e902RdFBGR+Slj
-=Xjbc
+iEYEARECAAYFAk492PUACgkQAiZjviIA2XgZ1ACgipuGH9aNjAqFJOI2uwo8BigL
+IScAoPCyIG2zhqBCY/gj2THjgQCaLObh
+=LH5X
 -----END PGP SIGNATURE-----

diff --git a/dev-ruby/amazon-ec2/amazon-ec2-0.9.17.ebuild b/dev-ruby/amazon-ec2/amazon-ec2-0.9.17.ebuild
index d2593adc89c2e3d3eaf8ed788f9cf9f3183d0197..e26f1afc46ea2e5f052be626827e00e8adc8d4be 100644 (file)
--- a/dev-ruby/amazon-ec2/amazon-ec2-0.9.17.ebuild
+++ b/dev-ruby/amazon-ec2/amazon-ec2-0.9.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.17.ebuild,v 1.1 2011/07/21 10:00:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amazon-ec2/amazon-ec2-0.9.17.ebuild,v 1.2 2011/08/07 00:14:46 flameeyes Exp $
 
 EAPI=2
 
@@ -29,23 +29,17 @@ USE_RUBY=ruby18 \
 
 ruby_add_bdepend "
        test? (
-               virtual/ruby-test-unit
+               dev-ruby/test-unit:2
                >=dev-ruby/test-spec-0.10.0
                >=dev-ruby/mocha-0.9.8
                dev-ruby/yard
        )"
-ruby_add_rdepend '>=dev-ruby/xml-simple-1.0.12'
-
-each_ruby_prepare() {
-       case ${RUBY} in
-               *ruby19)
-                       ;;
-               *)
-                       # Remove the reference to test-unit gem, since it's only
-                       # available on Ruby 1.9.
-                       sed -i -e '/^gem/s:^:#:' test/test_helper.rb || die
-                       ;;
-       esac
+ruby_add_rdepend '
+       >=dev-ruby/xml-simple-1.0.12
+       virtual/ruby-ssl'
+
+all_ruby_prepare() {
+       epatch "${FILESDIR}"/${P}+ruby-1.9.2.patch
 
        rm Gemfile || die
        sed -i -e '/[Bb]undler/d' Rakefile || die

diff --git a/dev-ruby/amazon-ec2/files/amazon-ec2-0.9.17+ruby-1.9.2.patch b/dev-ruby/amazon-ec2/files/amazon-ec2-0.9.17+ruby-1.9.2.patch
new file mode 100644 (file)
index 0000000..631e9a7
--- /dev/null
+++ b/dev-ruby/amazon-ec2/files/amazon-ec2-0.9.17+ruby-1.9.2.patch
@@ -0,0 +1,311 @@
+From 664a157dfa4067adba5ce5d6d7839288b3691cd9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Sun, 7 Aug 2011 01:38:55 +0200
+Subject: [PATCH] Fix relative-path inclusion to work with Ruby 1.9.2 and
+ later.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
+---
+ test/test_Autoscaling_groups.rb         |    2 +-
+ test/test_EC2.rb                        |    2 +-
+ test/test_EC2_availability_zones.rb     |    2 +-
+ test/test_EC2_console.rb                |    2 +-
+ test/test_EC2_elastic_ips.rb            |    2 +-
+ test/test_EC2_image_attributes.rb       |    2 +-
+ test/test_EC2_images.rb                 |    2 +-
+ test/test_EC2_instances.rb              |    2 +-
+ test/test_EC2_keypairs.rb               |    2 +-
+ test/test_EC2_password.rb               |    2 +-
+ test/test_EC2_products.rb               |    2 +-
+ test/test_EC2_responses.rb              |    2 +-
+ test/test_EC2_s3_xmlsimple.rb           |    2 +-
+ test/test_EC2_security_groups.rb        |    2 +-
+ test/test_EC2_snapshots.rb              |    2 +-
+ test/test_EC2_spot_instance_requests.rb |    2 +-
+ test/test_EC2_spot_prices.rb            |    2 +-
+ test/test_EC2_subnets.rb                |    2 +-
+ test/test_EC2_volumes.rb                |    2 +-
+ test/test_ELB_load_balancers.rb         |    2 +-
+ test/test_RDS.rb                        |    2 +-
+ test/test_helper.rb                     |    2 +-
+ 22 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/test/test_Autoscaling_groups.rb b/test/test_Autoscaling_groups.rb
+index 70ce3e1..4a768ff 100644
+--- a/test/test_Autoscaling_groups.rb
++++ b/test/test_Autoscaling_groups.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "autoscaling " do
+   before do
+diff --git a/test/test_EC2.rb b/test/test_EC2.rb
+index 96d4cc9..8d8ffac 100644
+--- a/test/test_EC2.rb
++++ b/test/test_EC2.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "The EC2 method " do
+ 
+diff --git a/test/test_EC2_availability_zones.rb b/test/test_EC2_availability_zones.rb
+index 2c3ae7d..ee6bd54 100644
+--- a/test/test_EC2_availability_zones.rb
++++ b/test/test_EC2_availability_zones.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "EC2 availability zones" do
+ 
+diff --git a/test/test_EC2_console.rb b/test/test_EC2_console.rb
+index 00b16ec..e228522 100644
+--- a/test/test_EC2_console.rb
++++ b/test/test_EC2_console.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "The EC2 console " do
+ 
+diff --git a/test/test_EC2_elastic_ips.rb b/test/test_EC2_elastic_ips.rb
+index 337f135..92031bc 100644
+--- a/test/test_EC2_elastic_ips.rb
++++ b/test/test_EC2_elastic_ips.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "EC2 elastic IP addresses " do
+ 
+diff --git a/test/test_EC2_image_attributes.rb b/test/test_EC2_image_attributes.rb
+index 3946c90..68b1e91 100644
+--- a/test/test_EC2_image_attributes.rb
++++ b/test/test_EC2_image_attributes.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "EC2 image_attributes " do
+ 
+diff --git a/test/test_EC2_images.rb b/test/test_EC2_images.rb
+index 8ca481f..21aea2d 100644
+--- a/test/test_EC2_images.rb
++++ b/test/test_EC2_images.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "An EC2 image " do
+ 
+diff --git a/test/test_EC2_instances.rb b/test/test_EC2_instances.rb
+index 2d771d4..b4e7d63 100644
+--- a/test/test_EC2_instances.rb
++++ b/test/test_EC2_instances.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "EC2 instances " do
+ 
+diff --git a/test/test_EC2_keypairs.rb b/test/test_EC2_keypairs.rb
+index f56254b..7d08962 100644
+--- a/test/test_EC2_keypairs.rb
++++ b/test/test_EC2_keypairs.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "EC2 keypairs " do
+ 
+diff --git a/test/test_EC2_password.rb b/test/test_EC2_password.rb
+index 64cad38..9646931 100644
+--- a/test/test_EC2_password.rb
++++ b/test/test_EC2_password.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "The EC2 password " do
+ 
+diff --git a/test/test_EC2_products.rb b/test/test_EC2_products.rb
+index bf7c178..a84d772 100644
+--- a/test/test_EC2_products.rb
++++ b/test/test_EC2_products.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "An EC2 instance " do
+ 
+diff --git a/test/test_EC2_responses.rb b/test/test_EC2_responses.rb
+index 999c4b8..1e4ca5a 100644
+--- a/test/test_EC2_responses.rb
++++ b/test/test_EC2_responses.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "The Response classes " do
+ 
+diff --git a/test/test_EC2_s3_xmlsimple.rb b/test/test_EC2_s3_xmlsimple.rb
+index 4ebe156..0358caa 100644
+--- a/test/test_EC2_s3_xmlsimple.rb
++++ b/test/test_EC2_s3_xmlsimple.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ # NOTE : These tests exercise amazon-ec2 when used with the aws/s3 gem
+ # which was demonstrating some breaking behavior.  The fix was to
+diff --git a/test/test_EC2_security_groups.rb b/test/test_EC2_security_groups.rb
+index d44235b..fc434af 100644
+--- a/test/test_EC2_security_groups.rb
++++ b/test/test_EC2_security_groups.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "EC2 security groups " do
+ 
+diff --git a/test/test_EC2_snapshots.rb b/test/test_EC2_snapshots.rb
+index 1a13513..2e77e92 100644
+--- a/test/test_EC2_snapshots.rb
++++ b/test/test_EC2_snapshots.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "EC2 snaphots " do
+ 
+diff --git a/test/test_EC2_spot_instance_requests.rb b/test/test_EC2_spot_instance_requests.rb
+index c751ac0..c30347a 100644
+--- a/test/test_EC2_spot_instance_requests.rb
++++ b/test/test_EC2_spot_instance_requests.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "An EC2 spot instances request " do
+ 
+diff --git a/test/test_EC2_spot_prices.rb b/test/test_EC2_spot_prices.rb
+index 485d885..d20bede 100644
+--- a/test/test_EC2_spot_prices.rb
++++ b/test/test_EC2_spot_prices.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "Spot price history " do
+ 
+diff --git a/test/test_EC2_subnets.rb b/test/test_EC2_subnets.rb
+index 19ece5e..60b4c4b 100644
+--- a/test/test_EC2_subnets.rb
++++ b/test/test_EC2_subnets.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "The EC2 subnets " do
+ 
+diff --git a/test/test_EC2_volumes.rb b/test/test_EC2_volumes.rb
+index c118ca1..4170359 100644
+--- a/test/test_EC2_volumes.rb
++++ b/test/test_EC2_volumes.rb
+@@ -8,7 +8,7 @@
+ # Home::      http://github.com/grempe/amazon-ec2/tree/master
+ #++
+ 
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "EC2 volumes " do
+ 
+diff --git a/test/test_ELB_load_balancers.rb b/test/test_ELB_load_balancers.rb
+index 48fa12d..33666d0 100644
+--- a/test/test_ELB_load_balancers.rb
++++ b/test/test_ELB_load_balancers.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "elb load balancers " do
+   before do
+diff --git a/test/test_RDS.rb b/test/test_RDS.rb
+index 083071d..eb29dac 100644
+--- a/test/test_RDS.rb
++++ b/test/test_RDS.rb
+@@ -1,4 +1,4 @@
+-require File.dirname(__FILE__) + '/test_helper.rb'
++require File.expand_path('../test_helper.rb', __FILE__)
+ 
+ context "rds databases " do
+   before do
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index 14562e1..33bf0c8 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -19,5 +19,5 @@ gem 'test-unit'
+   end
+ }
+ 
+-require File.dirname(__FILE__) + '/../lib/AWS'
++require File.expand_path('../../lib/AWS', __FILE__)
+ 
+-- 
+1.7.6
+