[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rdoc/

[Hans de Graaff]

commit:     8fd2f6b5a873f21ee882f2c060acb038b0475900
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 08:04:32 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 08:16:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd2f6b5

dev-ruby/rdoc: fix tests with json 2.x installed

Package-Manager: portage-2.2.28

 dev-ruby/rdoc/rdoc-4.2.2.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dev-ruby/rdoc/rdoc-4.2.2.ebuild b/dev-ruby/rdoc/rdoc-4.2.2.ebuild
index c93cada..1b3a999 100644
--- a/dev-ruby/rdoc/rdoc-4.2.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.2.2.ebuild
@@ -27,7 +27,7 @@ ruby_add_bdepend "
                >=dev-ruby/minitest-5.8:5
        )"
 
-ruby_add_rdepend "=dev-ruby/json-1* >=dev-ruby/json-1.4"
+ruby_add_rdepend ">=dev-ruby/json-1.4:0"
 
 all_ruby_prepare() {
        # Other packages also have use for a nonexistent directory, bug 321059
@@ -47,9 +47,6 @@ all_ruby_prepare() {
        # Remove test depending on FEATURES=userpriv, bug 361959
        sed -i -e '/def test_check_files/,/^  end/ s:^:#:' 
test/test_rdoc_options.rb || die
 
-       # Make sure we get the expected version of minitest.
-       #echo 'gem "minitest", "~> 5.8"' > test/test_0000.rb || die
-
        # Remove tests for code that is not included and not listed in 
Manifest.txt
        rm -f test/test_rdoc_i18n_{locale,text}.rb \
           test/test_rdoc_generator_pot* || die
@@ -72,7 +69,7 @@ each_ruby_compile() {
 }
 
 each_ruby_test() {
-       ${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+       ${RUBY} -Ilib:. -e 'gem "json", "~>1.4"; Dir["test/test_*.rb"].each{|f| 
require f}' || die
 }
 
 all_ruby_install() {