Add patch to work on Ruby 1.9.2 and add ruby19 to the list of compatible implementations.

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

4 files changed, 108 insertions, 12 deletions

diff --git a/dev-ruby/tidy-ext/ChangeLog b/dev-ruby/tidy-ext/ChangeLog
index d42125161dcd..76c6d0a48470 100644
--- a/dev-ruby/tidy-ext/ChangeLog
+++ b/dev-ruby/tidy-ext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/tidy-ext
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/ChangeLog,v 1.1 2011/01/25 06:50:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/ChangeLog,v 1.2 2011/02/15 22:15:53 flameeyes Exp $
+
+  15 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org> tidy-ext-0.1.10.ebuild,
+  +files/tidy-ext-0.1.10-gentoo.patch:
+  Add patch to work on Ruby 1.9.2 and add ruby19 to the list of compatible
+  implementations.
 
 *tidy-ext-0.1.10 (25 Jan 2011)
 
diff --git a/dev-ruby/tidy-ext/Manifest b/dev-ruby/tidy-ext/Manifest
index 2a9b039c4681..44fe6f847fec 100644
--- a/dev-ruby/tidy-ext/Manifest
+++ b/dev-ruby/tidy-ext/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX tidy-ext-0.1.10-gentoo.patch 2391 RMD160 430ccccac4c7b00bb20413fb8515512a0bc560e8 SHA1 f4c1adebec365f1e03d099730a8fdd2734d65ebc SHA256 d342624c88609567eb08f34b51f2b60382eb2bf896c461d4b6a86ddcd25b383b
 DIST tidy-ext-0.1.10.gem 259584 RMD160 d9d68c59427f2301b9569a2834265d77f2be1122 SHA1 cbd8c917eadc8ba12094fad034876f58a20f4cd9 SHA256 663ae90b25750c3c12f8de5ae74edf6127cb8c28ac41a34148a6efe475b6d166
-EBUILD tidy-ext-0.1.10.ebuild 823 RMD160 e1b50fe62d64ab1b0f31a9697c2bbb91f2e8908a SHA1 33cabd798bbd502a9ec9d5c3bf837262c79f0de9 SHA256 65ff6f61b07d29cb7871d4362da6d59a4a2e703bd9ffa89bdc552e50112bdfe0
-MISC ChangeLog 412 RMD160 25f055fc8ee4f124b9f3d5760bc93049bd7ad614 SHA1 6f89d7ef23da5d47ce886f2c8a21b2fa6bb280ff SHA256 e8535c3b6d1f3c91679284ca9ca4d29bfd0cd0e587d207243e6f8a955ebf4db2
+EBUILD tidy-ext-0.1.10.ebuild 874 RMD160 789ecb85a805fa4d86b0981cf136733a70c38281 SHA1 1c9c4efff655508a1fac662eb4381d1e3215ab71 SHA256 e6f0d0a9c2cdf635a7963a2093a831607ae308894dc679596b1aab3f22758dd2
+MISC ChangeLog 629 RMD160 fa584f88fdb6e5c46e5fe12692c160be9e33a15c SHA1 4a91c8eb5af7bbffd751920292ca11d11569094c SHA256 ccd08753f1fa1612af2272086a9f44c1c99296c9bc110941894759a2518efc7d
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0+ctQACgkQrnu0mw69JkoiSgD+IIUfAlkzPtnLKMfLuZr3eHov
-3SOZ5OpaLrqGSgkzPysA/2jpHVegNZxrZ/TZgzdtHlKf8RLmTYmz/2mJ7cLIDVq8
-=vQrh
+iEYEARECAAYFAk1a+zwACgkQAiZjviIA2XjmSwCg7xTBp7JFOziWR3XVDgymfXSu
+rJgAn3AVI86xUTVHnxKY8EkffhOmStXu
+=YqcH
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/tidy-ext/files/tidy-ext-0.1.10-gentoo.patch b/dev-ruby/tidy-ext/files/tidy-ext-0.1.10-gentoo.patch
new file mode 100644
index 000000000000..83de729df4cf
--- /dev/null
+++ b/dev-ruby/tidy-ext/files/tidy-ext-0.1.10-gentoo.patch
@@ -0,0 +1,88 @@
+diff --git a/ruby/Rakefile b/ruby/Rakefile
+index 031dfa2..ccd7c91 100644
+--- a/ruby/Rakefile
++++ b/ruby/Rakefile
+@@ -1,6 +1,5 @@
+ require 'rubygems'
+ require 'rake'
+-require 'rake/extensiontask'
+ 
+ begin
+   require 'jeweler'
+@@ -14,6 +13,8 @@ begin
+     gem.extensions = FileList["ext/**/extconf.rb"]
+   end
+   Jeweler::GemcutterTasks.new
++
++  task :spec => :check_dependencies
+ rescue LoadError
+   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+ end
+@@ -23,6 +24,7 @@ task :console do
+   exec("irb -I lib -r tidy/alone")
+ end
+ 
++begin
+ require 'spec/rake/spectask'
+ Spec::Rake::SpecTask.new(:spec) do |spec|
+   spec.libs << 'lib' << 'spec'
+@@ -35,9 +37,10 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
+   spec.rcov = true
+ end
+ 
+-task :spec => :check_dependencies
+-
+ task :default => :spec
++rescue LoadError
++  puts "RSpec (or a dependency) not available. Install it with: gem install rspec"
++end
+ 
+ require 'rake/rdoctask'
+ Rake::RDocTask.new do |rdoc|
+@@ -49,11 +52,16 @@ Rake::RDocTask.new do |rdoc|
+   rdoc.rdoc_files.include('lib/**/*.rb')
+ end
+ 
++begin
++  require 'rake/extensiontask'
+ Rake::ExtensionTask.new do |ext|
+   ext.name = 'tidy'
+   ext.ext_dir = 'ext/tidy'
+   ext.config_options << '--with-coverage' if ENV['COV']
+ end
++rescue LoadError
++  puts "rake-compiler not available. Install it with: gem install rake-compiler"
++end
+ 
+ namespace :gcov do
+ 
+diff --git a/ruby/spec/tidy/compat_spec.rb b/ruby/spec/tidy/compat_spec.rb
+index 0bb1e77..63b285a 100644
+--- a/ruby/spec/tidy/compat_spec.rb
++++ b/ruby/spec/tidy/compat_spec.rb
+@@ -1,4 +1,4 @@
+-require File.join(File.dirname(__FILE__), "..", "spec_helper")
++require "spec_helper"
+ 
+ describe "tidy compatibility methods" do
+ 
+diff --git a/ruby/spec/tidy/remote_uri_spec.rb b/ruby/spec/tidy/remote_uri_spec.rb
+index 8426ab7..c3e0ba8 100644
+--- a/ruby/spec/tidy/remote_uri_spec.rb
++++ b/ruby/spec/tidy/remote_uri_spec.rb
+@@ -1,4 +1,4 @@
+-require File.join(File.dirname(__FILE__), "..", "spec_helper")
++require "spec_helper"
+ require 'open-uri'
+ 
+ describe "tidy class methods" do
+diff --git a/ruby/spec/tidy/tidy_spec.rb b/ruby/spec/tidy/tidy_spec.rb
+index 2ad49e6..bb7ffc7 100644
+--- a/ruby/spec/tidy/tidy_spec.rb
++++ b/ruby/spec/tidy/tidy_spec.rb
+@@ -1,4 +1,4 @@
+-require File.join(File.dirname(__FILE__), "..", "spec_helper")
++require "spec_helper"
+ 
+ describe "tidy class methods" do
+ 
diff --git a/dev-ruby/tidy-ext/tidy-ext-0.1.10.ebuild b/dev-ruby/tidy-ext/tidy-ext-0.1.10.ebuild
index 0ed8a025283a..c02dffd87813 100644
--- a/dev-ruby/tidy-ext/tidy-ext-0.1.10.ebuild
+++ b/dev-ruby/tidy-ext/tidy-ext-0.1.10.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/tidy-ext-0.1.10.ebuild,v 1.1 2011/01/25 06:50:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/tidy-ext/tidy-ext-0.1.10.ebuild,v 1.2 2011/02/15 22:15:53 flameeyes Exp $
 
 EAPI=2
-USE_RUBY="ruby18 ree18"
+USE_RUBY="ruby18 ruby19 ree18"
 
 RUBY_FAKEGEM_DOCDIR="rdoc"
 
@@ -19,10 +19,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
+ruby_add_bdepend "test? ( dev-ruby/rspec:0 )"
+
+RUBY_PATCHES="${FILESDIR}/${P}-gentoo.patch"
+
 each_ruby_prepare() {
 	mkdir lib || die
-
-	sed -i -e '/check_dependencies/d' Rakefile || die
 }
 
 each_ruby_configure() {