Version bump, add a patch so that tests pass on Ruby 1.9.

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

4 files changed, 48 insertions, 10 deletions

diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index 0a0f1da38e97..1b859f0fe1bd 100644
--- a/dev-ruby/rdoc/ChangeLog
+++ b/dev-ruby/rdoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rdoc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.27 2010/04/22 06:07:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.28 2010/04/26 14:25:52 flameeyes Exp $
+
+*rdoc-2.5.6 (26 Apr 2010)
+
+  26 Apr 2010; Diego E. Pettenò <flameeyes@gentoo.org> -rdoc-2.5.5.ebuild,
+  +rdoc-2.5.6.ebuild, +files/rdoc-2.5.6-ruby19.patch:
+  Version bump, add a patch so that tests pass on Ruby 1.9.
 
 *rdoc-2.5.5 (22 Apr 2010)
 
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 6b9b74967983..9335fb79b32f 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX rdoc-2.5.6-ruby19.patch 959 RMD160 951cd3c166dab07f0afcdb46112001b58fbdd05a SHA1 4b94a9a235f909651ce8a9acbbb418fe3754d1ff SHA256 2c81c17d99f896182805b737e64c353045b4505acd693a19cd1f0adcff7e040d
 DIST rdoc-2.4.3.tgz 175749 RMD160 c8b05a6a637a6435248fe7a4010f692875be3dcc SHA1 eef9efa6e8a3d697d4fc5d71abf6b061113d7536 SHA256 130165e2bad7fb6694ff23441f1be257045be0f2ebb5b15ed9fe9ac57115a0c7
-DIST rdoc-2.5.5.tgz 177472 RMD160 ee4c86f29ec6a5dc95738e60195bd619556a4cf6 SHA1 5260ac6590eb46b9ff2d9d3ef5f64a64006a151b SHA256 6d906e1132495064f05bd11484addcceb89c1644e123e68b6d318ba261230fb1
+DIST rdoc-2.5.6.tgz 177856 RMD160 0dfaf267a7b85ae25f49f342eb38d4b8ecc9072a SHA1 e9dee3c1e9c5f0d32af5506989c59069455075a1 SHA256 18ffa0ffdc0d263d571c5a7c515883187e85cc84404902ef69a536660c6d444a
 EBUILD rdoc-2.4.3-r1.ebuild 1247 RMD160 e25e9225761f50c10474e19c545be9ae7cdd4f0b SHA1 1c412ab9a62b977ce32000e2ed225670fb26d869 SHA256 0b656383c3c919c5816822b7731b4b786ccaaabf60477565088fa23e417b5372
-EBUILD rdoc-2.5.5.ebuild 1246 RMD160 33a41e9fd2fe18d4c8f90ab3c96d4e3c9d7432b7 SHA1 f987dd291001b93efa651bbb0a55a22e894c1c85 SHA256 8f8e45f7845ac18677dc569d07b4d79ca11dcae4027230d1994795452eda81ec
-MISC ChangeLog 2019 RMD160 dde3989f8fe9d4eae2d583682eab090869a1a167 SHA1 0d0b780a9f7088f2d28df02a550aac91ff890b66 SHA256 7acfe3501dfccb643d9948207afa3cc41f3e584083ccae4ccd41311b0d9dc730
+EBUILD rdoc-2.5.6.ebuild 1320 RMD160 3c75c1edb1123b5538045ea9c15d55888784c20e SHA1 01f94036e246d71809e7ef84533ea3db5e63e88e SHA256 8ae633dbc1b77a353c2f2647903c2bb1e274211f201ae79d0729e5b80580e744
+MISC ChangeLog 2240 RMD160 3d95d3227e0e79f104a01ef277313b5306621849 SHA1 3774fb6743563c53b79826fab725358a7ed84d5a SHA256 5c471d26dd5b4ed58b4caf33fa8a4b2c4c5d40cd3b9ff8e13c9ce626a0e80cf4
 MISC metadata.xml 158 RMD160 097f8145a9994f98be4971b43b23b9e5e8bccb66 SHA1 7ac646714b1ab83fda98f3ccdd8b48a31c148b27 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvP57cACgkQeM7EJeUH71PcfQCfcKtwksxs83FW2HhpDu5XJJKf
-KooAn2ssC+52YTwox28Nkwas+vLvrjop
-=6cB3
+iEYEARECAAYFAkvVon0ACgkQAiZjviIA2Xim0QCgzBg5f5m8aDAJcDXpqxI47t07
++8kAoIUimc+/Jj/YeN5TkEH42DhdBhPI
+=Je6M
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rdoc/files/rdoc-2.5.6-ruby19.patch b/dev-ruby/rdoc/files/rdoc-2.5.6-ruby19.patch
new file mode 100644
index 000000000000..f55bd948fff5
--- /dev/null
+++ b/dev-ruby/rdoc/files/rdoc-2.5.6-ruby19.patch
@@ -0,0 +1,27 @@
+Index: rdoc-2.5.6/test/test_rdoc_markup_pre_process.rb
+===================================================================
+--- rdoc-2.5.6.orig/test/test_rdoc_markup_pre_process.rb
++++ rdoc-2.5.6/test/test_rdoc_markup_pre_process.rb
+@@ -7,10 +7,10 @@ class TestRDocMarkupPreProcess < MiniTes
+ 
+   def setup
+     @tempfile = Tempfile.new 'test_rdoc_markup_pre_process'
+-    @name = File.basename @tempfile.path
+-    @dir  = File.dirname @tempfile.path
++    @tempname = File.basename @tempfile.path
++    @tempdir  = File.dirname @tempfile.path
+ 
+-    @pp = RDoc::Markup::PreProcess.new __FILE__, [@dir]
++    @pp = RDoc::Markup::PreProcess.new __FILE__, [@tempdir]
+   end
+ 
+   def teardown
+@@ -28,7 +28,7 @@ contents of a string.
+     @tempfile.flush
+     @tempfile.rewind
+ 
+-    content = @pp.include_file @name, ''
++    content = @pp.include_file @tempname, ''
+ 
+     expected = <<-EXPECTED
+ Regular expressions (<i>regexp</i>s) are patterns which describe the
diff --git a/dev-ruby/rdoc/rdoc-2.5.5.ebuild b/dev-ruby/rdoc/rdoc-2.5.6.ebuild
index 3b95afa5fa08..88c1c9d280df 100644
--- a/dev-ruby/rdoc/rdoc-2.5.5.ebuild
+++ b/dev-ruby/rdoc/rdoc-2.5.6.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/rdoc/rdoc-2.5.5.ebuild,v 1.1 2010/04/22 06:07:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-2.5.6.ebuild,v 1.1 2010/04/26 14:25:52 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ruby19 jruby"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt RI.txt"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem
+inherit ruby-fakegem eutils
 
 DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
 HOMEPAGE="http://rubyforge.org/projects/rdoc/"
@@ -27,6 +27,10 @@ ruby_add_bdepend test dev-ruby/hoe
 ruby_add_bdepend test virtual/ruby-minitest
 ruby_add_bdepend doc dev-ruby/hoe
 
+all_ruby_prepare() {
+	epatch "${FILESDIR}/${P}-ruby19.patch"
+}
+
 all_ruby_install() {
 	all_fakegem_install