| 1 |
graaff 12/04/30 08:23:53 |
| 2 |
|
| 3 |
Modified: ChangeLog rdoc-3.12.ebuild |
| 4 |
Log: |
| 5 |
Fix ruby 1.8 hash ordering test failures, bug 397657. Fix racc file generation. Avoid test requiring FEATURES=userpriv, bug 361959. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.74 dev-ruby/rdoc/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rdoc/ChangeLog?rev=1.74&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rdoc/ChangeLog?rev=1.74&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rdoc/ChangeLog?r1=1.73&r2=1.74 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v |
| 19 |
retrieving revision 1.73 |
| 20 |
retrieving revision 1.74 |
| 21 |
diff -u -r1.73 -r1.74 |
| 22 |
--- ChangeLog 1 Mar 2012 22:15:44 -0000 1.73 |
| 23 |
+++ ChangeLog 30 Apr 2012 08:23:53 -0000 1.74 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for dev-ruby/rdoc |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.73 2012/03/01 22:15:44 naota Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/ChangeLog,v 1.74 2012/04/30 08:23:53 graaff Exp $ |
| 29 |
+ |
| 30 |
+ 30 Apr 2012; Hans de Graaff <graaff@g.o> rdoc-3.12.ebuild, |
| 31 |
+ +files/rdoc-fix-hash-ordering-tests.patch: |
| 32 |
+ Fix ruby 1.8 hash ordering test failures, bug 397657. Fix racc file |
| 33 |
+ generation. Avoid test requiring FEATURES=userpriv, bug 361959. |
| 34 |
|
| 35 |
01 Mar 2012; Naohiro Aota <naota@g.o> rdoc-3.12.ebuild: |
| 36 |
Add ~x86-fbsd |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 dev-ruby/rdoc/rdoc-3.12.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: rdoc-3.12.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- rdoc-3.12.ebuild 1 Mar 2012 22:15:44 -0000 1.3 |
| 53 |
+++ rdoc-3.12.ebuild 30 Apr 2012 08:23:53 -0000 1.4 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2012 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild,v 1.3 2012/03/01 22:15:44 naota Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.ebuild,v 1.4 2012/04/30 08:23:53 graaff Exp $ |
| 59 |
|
| 60 |
EAPI=3 |
| 61 |
USE_RUBY="ruby18 ree18 ruby19 jruby" |
| 62 |
@@ -50,21 +50,24 @@ |
| 63 |
sed -i -e '/isolate/d' Rakefile || die |
| 64 |
|
| 65 |
epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch" |
| 66 |
+ epatch "${FILESDIR}/${PN}-fix-hash-ordering-tests.patch" |
| 67 |
|
| 68 |
# Remove test that is depending on the locale, which we can't garantuee. |
| 69 |
sed -i -e '/def test_encode_with/,/^ end/ s:^:#:' test/test_rdoc_options.rb || die |
| 70 |
+ |
| 71 |
+ # Remove test depending on FEATURES=userpriv, bug 361959 |
| 72 |
+ sed -i -e '/def test_check_files/,/^ end/ s:^:#:' test/test_rdoc_options.rb || die |
| 73 |
+ |
| 74 |
+ # Avoid the generate rule since it doesn't work on jruby, see below. |
| 75 |
+ sed -i -e '/:generate/d' Rakefile || die |
| 76 |
} |
| 77 |
|
| 78 |
-each_ruby_prepare() { |
| 79 |
- case ${RUBY} in |
| 80 |
- *jruby) |
| 81 |
- # Remove tests that will fail due to a bug in JRuby affecting |
| 82 |
- # Dir.mktmpdir: http://jira.codehaus.org/browse/JRUBY-4082 |
| 83 |
- rm test/test_rdoc_options.rb || die |
| 84 |
- ;; |
| 85 |
- *) |
| 86 |
- ;; |
| 87 |
- esac |
| 88 |
+each_ruby_compile() { |
| 89 |
+ # Generate the file inline here since the Rakefile confuses jruby |
| 90 |
+ # into a circular dependency. |
| 91 |
+ for file in lib/rdoc/rd/block_parser lib/rdoc/rd/inline_parser ; do |
| 92 |
+ ${RUBY} -S racc -l -o ${file}.rb ${file}.ry || die |
| 93 |
+ done |
| 94 |
} |
| 95 |
|
| 96 |
all_ruby_install() { |
Archives