Bump with a patch to work with recent amazon-ec2 (sent upstream).

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 55 insertions, 8 deletions

diff --git a/app-admin/rudy/ChangeLog b/app-admin/rudy/ChangeLog
index c1ad874bd0da..92561ea3021c 100644
--- a/app-admin/rudy/ChangeLog
+++ b/app-admin/rudy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/rudy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rudy/ChangeLog,v 1.2 2010/02/14 22:03:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rudy/ChangeLog,v 1.3 2010/02/19 12:04:38 flameeyes Exp $
+
+*rudy-0.9.6.002-r2 (19 Feb 2010)
+
+  19 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -rudy-0.9.6.002-r1.ebuild, +rudy-0.9.6.002-r2.ebuild,
+  +files/rudy-0.9.6.002+amazon-ec2-0.9.4.patch:
+  Bump with a patch to work with recent amazon-ec2 (sent upstream).
 
 *rudy-0.9.6.002-r1 (14 Feb 2010)
 
diff --git a/app-admin/rudy/Manifest b/app-admin/rudy/Manifest
index 11e3fc48f0bf..4dfc25237f94 100644
--- a/app-admin/rudy/Manifest
+++ b/app-admin/rudy/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX rudy-0.9.6.002+amazon-ec2-0.9.4.patch 1365 RMD160 85f1c845d3677010d509ae1950e265b7e6788215 SHA1 4a12a7246fac4a27ee3f856a989d97b2d0ca9049 SHA256 775593e39c8bbff04ff6db8077b76bbcc5bd51019879392f3008a32e7ae54be0
 DIST rudy-git-0.9.6.002.tgz 100852 RMD160 cdf4949f1b15f1e8f89052c50a118f491d2dbb53 SHA1 ffba697abb4cf7cdae4f242ea032ce7eabe4af28 SHA256 38e3e30e760f95381d29ddf6b887f7fb4d2c112c671b6498797f90fca4b73a8e
-EBUILD rudy-0.9.6.002-r1.ebuild 1110 RMD160 35a6c3ab415296778862d48f7fbaf1196e36c398 SHA1 27576c40776521206ed59e3f29c6f072fc91c541 SHA256 1639495c4444946c7d57b7ab7ec8371983b0aacd4a4df258fcefb498488554a4
-MISC ChangeLog 549 RMD160 c8b6571e465cf211d9a2255ed4926ac90ac0e6cd SHA1 fdd5d4a95c9b6436a7bed629d937a0e2984fc19f SHA256 641f744a365554e8c6d67ac3b96875fdf934b3a255ef02445c821833e7ecf3d1
+EBUILD rudy-0.9.6.002-r2.ebuild 1191 RMD160 aad5c1ec19a9b5782f80b97085b00bd041696003 SHA1 0a7591eb281e88143262d1e494f43b0160da6541 SHA256 0634e7d0474a4fc197aa2349b7e315e9f6b446d604cf9b9ed14640a5db91de40
+MISC ChangeLog 812 RMD160 9692bc8f3104eefba50d104e0aa0eb7bcf256b14 SHA1 deeb02129fb1eaa483e691fa136d4db326a9167f SHA256 22444144350e6c6a55cadf0cb914aced2f1c7e6e5e65b832249b9539d44499ee
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt4cyUACgkQAiZjviIA2XjynQCg2uJsGPgjJtp9TTSAFaXHhPHe
-PfYAoItWvbU5icIuemgWPFIITUDgnyGw
-=1Ajt
+iEYEARECAAYFAkt+fgwACgkQAiZjviIA2Xhd+ACgxNmukWkzI51SmAz7HCgfppSr
+gYcAn3qHf5xznPNB7yGtFp7Z4t+MuChU
+=SZgB
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rudy/files/rudy-0.9.6.002+amazon-ec2-0.9.4.patch b/app-admin/rudy/files/rudy-0.9.6.002+amazon-ec2-0.9.4.patch
new file mode 100644
index 000000000000..56990cbe955e
--- /dev/null
+++ b/app-admin/rudy/files/rudy-0.9.6.002+amazon-ec2-0.9.4.patch
@@ -0,0 +1,35 @@
+diff --git a/lib/rudy/aws/ec2/instance.rb b/lib/rudy/aws/ec2/instance.rb
+index c24398f..a0800a4 100644
+--- a/lib/rudy/aws/ec2/instance.rb
++++ b/lib/rudy/aws/ec2/instance.rb
+@@ -77,10 +77,9 @@ module Rudy::AWS
+           :min_count => opts[:min],
+           :max_count => opts[:max] || opts[:min],
+           :key_name => (opts[:keypair] || '').to_s,
+-          :group_id => [opts[:group]].flatten.compact,
++          :security_group => [opts[:group]].flatten.compact,
+           #:user_data => opts[:machine_data],  # Error: Invalid BASE64 encoding of user data ??
+           :availability_zone => opts[:zone].to_s,
+-          :addressing_type => opts[:private] ? 'private' : 'public',
+           :instance_type => opts[:size].to_s,
+           :kernel_id => nil
+         }
+diff --git a/rudy.gemspec b/rudy.gemspec
+index 59f5695..fac738e 100644
+--- a/rudy.gemspec
++++ b/rudy.gemspec
+@@ -23,12 +23,13 @@
+   s.add_dependency 'caesars',    '>= 0.7.3'
+   s.add_dependency 'sysinfo',    '>= 0.7.0'
+   s.add_dependency 'gibbler',    '>= 0.7.1'
+-  s.add_dependency 'tryouts',    '>= 0.8.4'
+   s.add_dependency 'storable',   '>= 0.5.8'
+   
+   s.add_dependency 'aws-s3',     '>= 0.6.1'
+   s.add_dependency 'highline',   '>= 1.5.1'
+   s.add_dependency 'amazon-ec2', '>= 0.5.0'
++
++  s.add_development_dependency 'tryouts',    '>= 0.8.4'
+   
+   # = MANIFEST =
+   # git ls-files
diff --git a/app-admin/rudy/rudy-0.9.6.002-r1.ebuild b/app-admin/rudy/rudy-0.9.6.002-r2.ebuild
index 2361d4a90fe6..0e7253a609ab 100644
--- a/app-admin/rudy/rudy-0.9.6.002-r1.ebuild
+++ b/app-admin/rudy/rudy-0.9.6.002-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rudy/rudy-0.9.6.002-r1.ebuild,v 1.1 2010/02/14 22:03:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rudy/rudy-0.9.6.002-r2.ebuild,v 1.1 2010/02/19 12:04:38 flameeyes Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc examples/authorize.rb examples/ge
 
 RUBY_FAKEGEM_EXTRAINSTALL="Rudyfile"
 
-inherit ruby-fakegem
+inherit ruby-fakegem eutils
 
 DESCRIPTION="Not your grandparents' EC2 deployment tool"
 HOMEPAGE="http://solutious.com/"
@@ -41,3 +41,7 @@ ruby_add_rdepend '
 	>=dev-ruby/annoy-0.5.5
 	>=dev-ruby/attic-0.4.0
 	>=dev-ruby/rye-0.8.11'
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}+amazon-ec2-0.9.4.patch
+}