From 5aa711bbee253a7effafad80dcd5bcf9f414790d Mon Sep 17 00:00:00 2001
From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Tue, 16 Feb 2010 20:38:38 +0000
Subject: Fix litc to work properly. (Portage version: 2.2_rc62/cvs/Linux
 x86_64)

---
 dev-ruby/litc/ChangeLog                    |  9 +++-
 dev-ruby/litc/files/litc-1.0.2-fixes.patch | 71 ++++++++++++++++++++++++++++++
 dev-ruby/litc/files/litc-1.0.2-tests.patch | 40 -----------------
 dev-ruby/litc/litc-1.0.2-r1.ebuild         | 26 +++++++++++
 dev-ruby/litc/litc-1.0.2.ebuild            | 26 -----------
 5 files changed, 105 insertions(+), 67 deletions(-)
 create mode 100644 dev-ruby/litc/files/litc-1.0.2-fixes.patch
 delete mode 100644 dev-ruby/litc/files/litc-1.0.2-tests.patch
 create mode 100644 dev-ruby/litc/litc-1.0.2-r1.ebuild
 delete mode 100644 dev-ruby/litc/litc-1.0.2.ebuild

(limited to 'dev-ruby/litc')

diff --git a/dev-ruby/litc/ChangeLog b/dev-ruby/litc/ChangeLog
index 203f47918d3e..ebee140e7c62 100644
--- a/dev-ruby/litc/ChangeLog
+++ b/dev-ruby/litc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/litc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/litc/ChangeLog,v 1.2 2010/02/12 10:57:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/litc/ChangeLog,v 1.3 2010/02/16 20:38:37 flameeyes Exp $
+
+*litc-1.0.2-r1 (16 Feb 2010)
+
+  16 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org> -litc-1.0.2.ebuild,
+  +litc-1.0.2-r1.ebuild, +files/litc-1.0.2-fixes.patch,
+  -files/litc-1.0.2-tests.patch:
+  Fix litc to work properly.
 
   12 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org> litc-1.0.2.ebuild:
   Add ~x86 keyword (tested in development container).
diff --git a/dev-ruby/litc/files/litc-1.0.2-fixes.patch b/dev-ruby/litc/files/litc-1.0.2-fixes.patch
new file mode 100644
index 000000000000..6ab86e863993
--- /dev/null
+++ b/dev-ruby/litc/files/litc-1.0.2-fixes.patch
@@ -0,0 +1,71 @@
+diff --git a/Rakefile b/Rakefile
+index 31392f3..910113c 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -13,6 +13,8 @@ begin
+     gem.add_development_dependency "thoughtbot-shoulda"
+     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+   end
++
++  task :test => :check_dependencies
+ rescue LoadError
+   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+ end
+@@ -20,7 +22,7 @@ end
+ require 'rake/testtask'
+ Rake::TestTask.new(:test) do |test|
+   test.libs << 'lib' << 'test'
+-  test.pattern = 'test/**/*_test.rb'
++  test.pattern = 'test/**/test_*.rb'
+   test.verbose = true
+ end
+ 
+@@ -28,7 +30,7 @@ begin
+   require 'rcov/rcovtask'
+   Rcov::RcovTask.new do |test|
+     test.libs << 'test'
+-    test.pattern = 'test/**/*_test.rb'
++    test.pattern = 'test/**/test_*.rb'
+     test.verbose = true
+   end
+ rescue LoadError
+@@ -37,8 +39,6 @@ rescue LoadError
+   end
+ end
+ 
+-task :test => :check_dependencies
+-
+ task :default => :test
+ 
+ require 'rake/rdoctask'
+diff --git a/lib/litc.rb b/lib/litc.rb
+index 19836db..e4ab9c9 100644
+--- a/lib/litc.rb
++++ b/lib/litc.rb
+@@ -39,7 +39,7 @@ module Litc
+   #   latest
+   API_VERSION = "latest"
+ 
+-  def urlize item
++  def self.urlize item
+     item = item.to_s.gsub(/_/, '-')
+     if item =~ /(placement).+/ or item =~ /(block-device-mapping).+/
+       item.gsub!(/(#{$1})-(.*)$/,'\\1/\\2')
+@@ -50,7 +50,7 @@ module Litc
+     item
+   end
+ 
+-  def get(item)
++  def self.get(item)
+     item = urlize(item)
+ 
+     if item != 'user-data'
+@@ -65,7 +65,7 @@ module Litc
+     end
+   end
+ 
+-  def method_missing(meth, *args, &block)
++  def self.method_missing(meth, *args, &block)
+     if ITEMS.include?(urlize(meth))
+       get(meth)
+     else
diff --git a/dev-ruby/litc/files/litc-1.0.2-tests.patch b/dev-ruby/litc/files/litc-1.0.2-tests.patch
deleted file mode 100644
index c0b152705804..000000000000
--- a/dev-ruby/litc/files/litc-1.0.2-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Rakefile b/Rakefile
-index 31392f3..910113c 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -13,6 +13,8 @@ begin
-     gem.add_development_dependency "thoughtbot-shoulda"
-     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-   end
-+
-+  task :test => :check_dependencies
- rescue LoadError
-   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
- end
-@@ -20,7 +22,7 @@ end
- require 'rake/testtask'
- Rake::TestTask.new(:test) do |test|
-   test.libs << 'lib' << 'test'
--  test.pattern = 'test/**/*_test.rb'
-+  test.pattern = 'test/**/test_*.rb'
-   test.verbose = true
- end
- 
-@@ -28,7 +30,7 @@ begin
-   require 'rcov/rcovtask'
-   Rcov::RcovTask.new do |test|
-     test.libs << 'test'
--    test.pattern = 'test/**/*_test.rb'
-+    test.pattern = 'test/**/test_*.rb'
-     test.verbose = true
-   end
- rescue LoadError
-@@ -37,8 +39,6 @@ rescue LoadError
-   end
- end
- 
--task :test => :check_dependencies
--
- task :default => :test
- 
- require 'rake/rdoctask'
diff --git a/dev-ruby/litc/litc-1.0.2-r1.ebuild b/dev-ruby/litc/litc-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..1538a1bd0747
--- /dev/null
+++ b/dev-ruby/litc/litc-1.0.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/litc/litc-1.0.2-r1.ebuild,v 1.1 2010/02/16 20:38:37 flameeyes Exp $
+
+EAPI=2
+USE_RUBY="ruby18 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="rerdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A tiny ruby module for Amazon EC2 intance metadata"
+HOMEPAGE="http://github.com/bkaney/litc"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend test "dev-ruby/shoulda dev-ruby/fakeweb dev-ruby/ruby-debug"
+
+all_ruby_prepare() {
+	epatch "${FILESDIR}"/${P}-fixes.patch
+}
diff --git a/dev-ruby/litc/litc-1.0.2.ebuild b/dev-ruby/litc/litc-1.0.2.ebuild
deleted file mode 100644
index 1114cc209450..000000000000
--- a/dev-ruby/litc/litc-1.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/litc/litc-1.0.2.ebuild,v 1.2 2010/02/12 10:57:08 flameeyes Exp $
-
-EAPI=2
-USE_RUBY="ruby18 jruby"
-
-RUBY_FAKEGEM_TASK_DOC="rerdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A tiny ruby module for Amazon EC2 intance metadata"
-HOMEPAGE="http://github.com/bkaney/litc"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend test "dev-ruby/shoulda dev-ruby/fakeweb dev-ruby/ruby-debug"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}"/${P}-tests.patch
-}
-- 
cgit v1.2.3-65-gdbad