Fix ruby 1.8 hash ordering test failures, bug 397657. Fix racc file generation. Avoid test requiring FEATURES=userpriv, bug 361959.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 116 insertions, 19 deletions

diff --git a/dev-ruby/rdoc/ChangeLog b/dev-ruby/rdoc/ChangeLog
index 591ea355ff2f..50bd7ff0f5d9 100644
--- a/dev-ruby/rdoc/ChangeLog
+++ b/dev-ruby/rdoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rdoc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.73 2012/03/01 22:15:44 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.74 2012/04/30 08:23:53 graaff Exp $
+
+  30 Apr 2012; Hans de Graaff <graaff@gentoo.org> rdoc-3.12.ebuild,
+  +files/rdoc-fix-hash-ordering-tests.patch:
+  Fix ruby 1.8 hash ordering test failures, bug 397657. Fix racc file
+  generation. Avoid test requiring FEATURES=userpriv, bug 361959.
 
   01 Mar 2012; Naohiro Aota <naota@gentoo.org> rdoc-3.12.ebuild:
   Add ~x86-fbsd
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 8f913399d922..31559584dd51 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX rdoc-2.5.6-ruby19.patch 959 RMD160 951cd3c166dab07f0afcdb46112001b58fbdd05a SHA1 4b94a9a235f909651ce8a9acbbb418fe3754d1ff SHA256 2c81c17d99f896182805b737e64c353045b4505acd693a19cd1f0adcff7e040d
 AUX rdoc-3.0.1-bin-require.patch 632 RMD160 1210d1fc3b92bc37c21988fc6d94d70d0ca43e10 SHA1 243a783b95b47d78758fe1c6f439718655a52c90 SHA256 5b8468ba10d6767620ee6ecad9719f213744c6de207ecab078dd48f96147ad50
+AUX rdoc-fix-hash-ordering-tests.patch 3124 RMD160 99e8581a35252be7f38558f61068b847a3f5e427 SHA1 0a7f371283732eaf197207f6b721b60624064233 SHA256 e28b0f19d7c954f5d49a783a1a8db087256be0523fccd5f5887582ae891d5f45
 DIST rdoc-2.5.11.tgz 180539 RMD160 beeddf048e3ef489fe1e8b0f436432f4dc195256 SHA1 5dece89968bbc8647cb02e0eed7287ec0cf28757 SHA256 7c11da5950d07d35875aa5de056f6b93baec4240779d8a5287eaa6073e495cda
 DIST rdoc-3.11.gem 311808 RMD160 c9036f2177da8a5c368653e6bcdbafa405b288c2 SHA1 4f4cb21b84df4938a11f54c26b064a7e68003a6d SHA256 353b31c71315bb9ceb69185bc9a2d5aa83a5195dd717fbb865fd06b18b280873
 DIST rdoc-3.12.gem 315904 RMD160 9ae71afff3e7d89f1993f64aaea728e1eef0d96b SHA1 0092906da815652255b6a1f694b2a4519131817c SHA256 77b6deba13ca090fb4608c218ec5d5c05d78e841cb0b53cb31f91fb56686a431
@@ -12,17 +13,17 @@ DIST rdoc-3.6.1.gem 235520 RMD160 6528e3019d9d5968489267a61dc942c6b0890d41 SHA1
 DIST rdoc-3.6.gem 235008 RMD160 5e222a148fff0161ca1c1af1cfd923132b48d9a8 SHA1 bb6561e33c25ff4a4110bb37e67f18952651651f SHA256 900a50e9fadce88c8af441fb348baa3fb5e74bb7eb79c5acf0311e42b4da46dd
 EBUILD rdoc-2.5.11.ebuild 1158 RMD160 f11c1cce0bae168c642c724dde462b4c70dbb199 SHA1 f55aca992176a43e779a1a6e349bd5a43961acfd SHA256 125b677f11f96f62afc55879fe2cac6460556f77cdc36c0ae5292a170e226e24
 EBUILD rdoc-3.11.ebuild 2165 RMD160 e1a93f7a1d8f28cce8949bb76f0ca7fd3412e298 SHA1 91c3c4d5e5c254432d630276407e981657763f7a SHA256 9a371f6fe86709ac12bf5f6a3d0b27837e55edd9acaf4e0b14c8dd2f7c1c36ae
-EBUILD rdoc-3.12.ebuild 2179 RMD160 ae4b5d2b6196ba7ae4f90ba8206b518518fbaae4 SHA1 ff27b8a9d946d345733e13d1a669b1a4bd10ac9c SHA256 e865d29060d7644d19f831b33c6a5076fa35f88e04baf0c46ebded2d7e8a6756
+EBUILD rdoc-3.12.ebuild 2505 RMD160 29bedfb82dd3eb8443780d02c8c0b8d2a15d8b8d SHA1 3995dd987e3fe7b01c5ea967844af2c441847b41 SHA256 0ce579b9dc8b8473cc9216d39c18464a687e5c850b25eb0bef25cd28be90d8b4
 EBUILD rdoc-3.5.1.ebuild 1682 RMD160 7ba63f11644b5f9e01d855e55b6d1c10d1149bbb SHA1 fd845d674a12799d15ae826d651eb93117dc49f5 SHA256 f8ac88024fc708aa53245f5be3dc8b16a6f0b4f45f094cef50e6814992125f38
 EBUILD rdoc-3.5.3.ebuild 1919 RMD160 3f1cf89628471213b73f6bfb3cd7a1c2c79ad6cd SHA1 f3df0e35be06f75678184a55ad96bb8f6d6cce27 SHA256 546eb7c17f857e5b3b3ff308ce73b26e7d0a194d2a23e410344fdc301c2a1554
 EBUILD rdoc-3.6.1.ebuild 1978 RMD160 5a194feff27304fa18d8d58a241cf4d045e586a9 SHA1 7845c3325b5e16bc3f323b94512752eff109f5da SHA256 1993142695deab247bc821304b4a3c895bddab30e03dbc2c0f736825ae0b31f4
 EBUILD rdoc-3.6.ebuild 1916 RMD160 56abc26aad579d54e33c7b4082c2265ea9178226 SHA1 9f00af3057bcf08f1220adfc8b86348863f440e1 SHA256 36c96348860ff459f0aafe803137f625badab26a2006d86da9fb1a21de6809d7
-MISC ChangeLog 7556 RMD160 dc3275f3d1698004295f2925b52faf7368059213 SHA1 a4ba931350e87969f31e550eb93d20eb422ba830 SHA256 917bb64f5098594872087d2b8f5b57edd38ab99685970725e260af7774fc5487
+MISC ChangeLog 7807 RMD160 8113ab55289725436d8fc33beb009739870f94e6 SHA1 27ea944b39fdd6ea2da7ad6fbea9cacb6b7bb3c1 SHA256 65f03b7451eef81e1b60118c178ba3140d13439a125b6c873ddec9d7e884e71e
 MISC metadata.xml 230 RMD160 e4b048e239d2d0ab7d6612d495348460015aa32e SHA1 282fff70f4d76e63d5718e3a751930e84d85d750 SHA256 a04255553b410ad36340c3a47e4f30304c388b503b27c07c3e6f9bbdc9dbbd54
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk93TXMACgkQ/ejvha5XGaOphwCdHGFwCy3EmCKEepmDt8lnUFj7
-itgAnjns/P/hlP2LBuHLWSYupwTHCjRf
-=Mqg7
+iF4EAREIAAYFAk+eTCMACgkQiIP6VqMIqNcZjgD+KoCZtmxtNej7CzDMxIr7ehWP
+xI64xsU4KvhluumcbPoA/0pPkCGXaokWzmm2y2f/KpgzYmpqb2QtdoiZ/AE0clCT
+=oeJm
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rdoc/files/rdoc-fix-hash-ordering-tests.patch b/dev-ruby/rdoc/files/rdoc-fix-hash-ordering-tests.patch
new file mode 100644
index 000000000000..95adfd1df319
--- /dev/null
+++ b/dev-ruby/rdoc/files/rdoc-fix-hash-ordering-tests.patch
@@ -0,0 +1,88 @@
+commit 2d606b3ca1378edf1c42ad58877c9bdaabf79480
+Author: Eric Hodel <drbrain@segment7.net>
+Date:   Sun Mar 11 18:00:21 2012 -0700
+
+    Fix hash-order-dependent tests
+
+diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
+index a3ca813..149a808 100644
+--- a/lib/rdoc/ri/driver.rb
++++ b/lib/rdoc/ri/driver.rb
+@@ -723,7 +723,7 @@ Options may also be set in the 'RI' environment variable.
+     page do |io|
+       io.puts "#{name} not found, maybe you meant:"
+       io.puts
+-      io.puts matches.join("\n")
++      io.puts matches.sort.join("\n")
+     end
+ 
+     false
+diff --git a/test/test_rdoc_context.rb b/test/test_rdoc_context.rb
+index 192a287..52f579c 100644
+--- a/test/test_rdoc_context.rb
++++ b/test/test_rdoc_context.rb
+@@ -340,7 +340,7 @@ class TestRDocContext < XrefTestCase
+ 
+   def test_classes
+     assert_equal %w[C2::C3], @c2.classes.map { |k| k.full_name }
+-    assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name }
++    assert_equal %w[C3::H1 C3::H2], @c3.classes.map { |k| k.full_name }.sort
+   end
+ 
+   def test_current_section
+diff --git a/test/test_rdoc_parser_ruby.rb b/test/test_rdoc_parser_ruby.rb
+index 1ff6f4d..18964f9 100644
+--- a/test/test_rdoc_parser_ruby.rb
++++ b/test/test_rdoc_parser_ruby.rb
+@@ -701,7 +701,7 @@ end
+ 
+     @parser.parse_class @top_level, false, @parser.get_tk, @comment
+ 
+-    assert_equal %w[A B],    RDoc::TopLevel.classes.map { |c| c.full_name }
++    assert_equal %w[A B], RDoc::TopLevel.classes.map { |c| c.full_name }.sort
+   end
+ 
+   def test_parse_class_single
+@@ -720,10 +720,12 @@ end
+ 
+     @parser.parse_class @top_level, false, @parser.get_tk, @comment
+ 
+-    assert_equal %w[A],    RDoc::TopLevel.classes.map { |c| c.full_name }
+-    assert_equal %w[A::B A::d], RDoc::TopLevel.modules.map { |c| c.full_name }
++    assert_equal %w[A], RDoc::TopLevel.classes.map { |c| c.full_name }
+ 
+-    b = RDoc::TopLevel.modules.first
++    modules = RDoc::TopLevel.modules.sort_by { |c| c.full_name }
++    assert_equal %w[A::B A::d], modules.map { |c| c.full_name }
++
++    b = modules.first
+     assert_equal 10, b.offset
+     assert_equal 2,  b.line
+ 
+@@ -1851,10 +1853,10 @@ end
+ 
+     @parser.parse_statements @top_level
+ 
+-    date, date_time = @top_level.classes
++    date, date_time = @top_level.classes.sort_by { |c| c.full_name }
+ 
+     date_now      = date.method_list.first
+-    date_time_now = date_time.method_list.first
++    date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
+ 
+     assert_equal :private, date_now.visibility
+     assert_equal :public,  date_time_now.visibility
+@@ -1876,10 +1878,11 @@ end
+ 
+     @parser.parse_statements @top_level
+ 
+-    date, date_time = @top_level.classes
++    # TODO sort classes by default
++    date, date_time = @top_level.classes.sort_by { |c| c.full_name }
+ 
+     date_now      = date.method_list.first
+-    date_time_now = date_time.method_list.first
++    date_time_now = date_time.method_list.sort_by { |m| m.full_name }.first
+ 
+     assert_equal :public,  date_now.visibility,      date_now.full_name
+     assert_equal :private, date_time_now.visibility, date_time_now.full_name
diff --git a/dev-ruby/rdoc/rdoc-3.12.ebuild b/dev-ruby/rdoc/rdoc-3.12.ebuild
index 44423552ff4f..7c9b39be2df3 100644
--- a/dev-ruby/rdoc/rdoc-3.12.ebuild
+++ b/dev-ruby/rdoc/rdoc-3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild,v 1.3 2012/03/01 22:15:44 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild,v 1.4 2012/04/30 08:23:53 graaff Exp $
 
 EAPI=3
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -50,21 +50,24 @@ all_ruby_prepare() {
 	sed -i -e '/isolate/d' Rakefile || die
 
 	epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch"
+	epatch "${FILESDIR}/${PN}-fix-hash-ordering-tests.patch"
 
 	# Remove test that is depending on the locale, which we can't garantuee.
 	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/test_rdoc_options.rb || die
+
+	# Avoid the generate rule since it doesn't work on jruby, see below.
+	sed -i -e '/:generate/d' Rakefile || die
 }
 
-each_ruby_prepare() {
-	case ${RUBY} in
-		*jruby)
-			# Remove tests that will fail due to a bug in JRuby affecting
-			# Dir.mktmpdir: http://jira.codehaus.org/browse/JRUBY-4082
-			rm test/test_rdoc_options.rb || die
-			;;
-		*)
-			;;
-	esac
+each_ruby_compile() {
+	# Generate the file inline here since the Rakefile confuses jruby
+	# into a circular dependency.
+	for file in lib/rdoc/rd/block_parser lib/rdoc/rd/inline_parser ; do
+		${RUBY} -S racc -l -o ${file}.rb ${file}.ry || die
+	done
 }
 
 all_ruby_install() {