Upstream released a new version with the patches merged in.

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

4 files changed, 14 insertions, 84 deletions

diff --git a/dev-ruby/litc/ChangeLog b/dev-ruby/litc/ChangeLog
index ebee140e7c62..812070b1326f 100644
--- a/dev-ruby/litc/ChangeLog
+++ b/dev-ruby/litc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.3 2010/02/16 20:38:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/litc/ChangeLog,v 1.4 2010/02/16 23:24:02 flameeyes Exp $
+
+*litc-1.0.3 (16 Feb 2010)
+
+  16 Feb 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -litc-1.0.2-r1.ebuild, -files/litc-1.0.2-fixes.patch, +litc-1.0.3.ebuild:
+  Upstream released a new version with the patches merged in.
 
 *litc-1.0.2-r1 (16 Feb 2010)
 
diff --git a/dev-ruby/litc/Manifest b/dev-ruby/litc/Manifest
index 2943cc4847af..3413559f6085 100644
--- a/dev-ruby/litc/Manifest
+++ b/dev-ruby/litc/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX litc-1.0.2-fixes.patch 1757 RMD160 6e687ee3e2d7ab44c1a554c574012d5cb3c223ab SHA1 7bf3aa45a68025bae122576dea7134254bed4f83 SHA256 efccec0d416b9b2ccd3ccce9e7e39d92846f74645ea9e908f835f8e179c39e72
-DIST litc-1.0.2.gem 9216 RMD160 12aee6e7a9f6842924ef5e5b0433227484d7c6da SHA1 0b5b276840d5b68c8672b10141d00dbd0f9583e6 SHA256 f2c1019cda9d775f2ff5aaadad118526c75f1032cae142c046c4da5b9d7d7e99
-EBUILD litc-1.0.2-r1.ebuild 672 RMD160 5faffbda262111a5578af787ec6763c267aabc96 SHA1 fe3e3e4585d9b10a569e244c45a68a17c3f7d9f7 SHA256 0bee30f50b5a12dd806b8caf6ed3ff28324954bbe43d42472a85b96cd0e327a6
-MISC ChangeLog 735 RMD160 4cbd243bd798653db8a18ec547ac5f8d892f3956 SHA1 211d0ea7a04c5702b24d4c3ffdcda6094de1d418 SHA256 395fc911fd08f586174bbb5e0f84e0b2902a8c5d1e4a1971d6d7f5f68439047c
+DIST litc-1.0.3.gem 9216 RMD160 5d6f09a45bd298f2ebdfd2a140ad5a0914b7a411 SHA1 a71672038bbe0b6cff469bba7ad2d73397e6af7b SHA256 e6b25eca229aba85d1529d8abd4d328f6448dc6b9f09074ec4092cbfae3bc8f0
+EBUILD litc-1.0.3.ebuild 606 RMD160 5b2c02fe6730c496df047b55ec68341b3992c6a6 SHA1 4c1173ab66c024f8154a1121fe1860f293c7b764 SHA256 aa032c6b665d6c4a7301b44754ca1f0e4c1669db774c92d0e27a3aadec9859ac
+MISC ChangeLog 957 RMD160 42f780f20d513193409074e31c0ef525a11b7e90 SHA1 4ad12edc59e51129cb36585519d781182d4bedd0 SHA256 bf83fc28b1451acd8e59d2edcc602213deeeaf0c65a6f9f4d1f569e9bd6c7ed6
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt7AigACgkQAiZjviIA2XgLKQCeMQUJr7XnPCJxk9zu6VxypFDG
-Vj0AoIYT7ZLXj7r+yVr2zESb4MTu0pKB
-=QL3X
+iEYEARECAAYFAkt7KOsACgkQAiZjviIA2XhQ2wCfVCixUn/DO7chLYLawvHj+WLx
+kfsAn2rO2Z03qMd2YH8mHnK8pmIiAM4/
+=JmBy
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/litc/files/litc-1.0.2-fixes.patch b/dev-ruby/litc/files/litc-1.0.2-fixes.patch
deleted file mode 100644
index 6ab86e863993..000000000000
--- a/dev-ruby/litc/files/litc-1.0.2-fixes.patch
+++ /dev/null
@@ -1,71 +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/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/litc-1.0.2-r1.ebuild b/dev-ruby/litc/litc-1.0.3.ebuild
index 1538a1bd0747..7c6feef1b74d 100644
--- a/dev-ruby/litc/litc-1.0.2-r1.ebuild
+++ b/dev-ruby/litc/litc-1.0.3.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/dev-ruby/litc/litc-1.0.2-r1.ebuild,v 1.1 2010/02/16 20:38:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/litc/litc-1.0.3.ebuild,v 1.1 2010/02/16 23:24:02 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 jruby"
@@ -20,7 +20,3 @@ 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
-}