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

[Hans de Graaff]

commit:     261495056fd8d9dd154fbdf2043b645e20a70d7a
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 15:49:25 2017 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 17:02:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26149505

dev-ruby/rubygems: add ruby25

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-ruby/rubygems/rubygems-2.7.3.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-ruby/rubygems/rubygems-2.7.3.ebuild 
b/dev-ruby/rubygems/rubygems-2.7.3.ebuild
index 89904eb2b14..377351f4a71 100644
--- a/dev-ruby/rubygems/rubygems-2.7.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-ng prefix
 
@@ -21,6 +21,7 @@ PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
 
 ruby_add_bdepend "
        test? (
+               dev-ruby/json
                >=dev-ruby/minitest-4:0
                dev-ruby/rdoc
        )"
@@ -67,8 +68,8 @@ each_ruby_test() {
        #unset RUBYOPT
 
        if [[ "${EUID}" -ne "0" ]]; then
-               RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test 
\
-                       -e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' 
|| die "tests failed"
+               RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} 
--disable-gems -I.:lib:test:bundler/lib \
+                       -e 'require "rubygems"; gem "minitest", "~>4.0"; 
Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
        else
                ewarn "The userpriv feature must be enabled to run tests, bug 
408951."
                eerror "Testsuite will not be run."