diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-04 13:47:42 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2010-08-04 13:47:42 +0000 |
| commit | 7510323d08224677ed20771ebb1a763a7ae097b8 (patch) | |
| tree | 8bf399d3eca9b4962526c05f2ff0795f8307280a /dev-ruby/rubygems | |
| parent | Version bump wrt #331195 by Nick White. (diff) | |
| download | gentoo-2-7510323d08224677ed20771ebb1a763a7ae097b8.tar.gz gentoo-2-7510323d08224677ed20771ebb1a763a7ae097b8.tar.bz2 gentoo-2-7510323d08224677ed20771ebb1a763a7ae097b8.zip | |
Bump to fix on MRI 1.8.6 where it failed before. Also drop hoe and rake dependencies for tests by running them manually instead.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/rubygems')
| -rw-r--r-- | dev-ruby/rubygems/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-ruby/rubygems/files/gentoo-defaults.rb | 2 | ||||
| -rw-r--r-- | dev-ruby/rubygems/rubygems-1.3.7-r3.ebuild (renamed from dev-ruby/rubygems/rubygems-1.3.7-r2.ebuild) | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog index f6263c4569a2..a0ce809b4199 100644 --- a/dev-ruby/rubygems/ChangeLog +++ b/dev-ruby/rubygems/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-ruby/rubygems # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.148 2010/08/03 16:07:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.149 2010/08/04 13:47:42 flameeyes Exp $ + +*rubygems-1.3.7-r3 (04 Aug 2010) + + 04 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> + -rubygems-1.3.7-r2.ebuild, +rubygems-1.3.7-r3.ebuild, + files/gentoo-defaults.rb: + Bump to fix on MRI 1.8.6 where it failed before. Also drop hoe and rake + dependencies for tests by running them manually instead. *rubygems-1.3.7-r2 (03 Aug 2010) diff --git a/dev-ruby/rubygems/files/gentoo-defaults.rb b/dev-ruby/rubygems/files/gentoo-defaults.rb index dba852e4203d..2f0bbae734f6 100644 --- a/dev-ruby/rubygems/files/gentoo-defaults.rb +++ b/dev-ruby/rubygems/files/gentoo-defaults.rb @@ -22,7 +22,7 @@ module Gem undef :ruby_engine def ruby_engine - if RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/ + if defined? RUBY_DESCRIPTION and RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/ "rubyee" else # Ruby 1.8 and Ruby 1.9.2_rc2 and later install here, and JRuby diff --git a/dev-ruby/rubygems/rubygems-1.3.7-r2.ebuild b/dev-ruby/rubygems/rubygems-1.3.7-r3.ebuild index fd464a176198..7a2dec84d3db 100644 --- a/dev-ruby/rubygems/rubygems-1.3.7-r2.ebuild +++ b/dev-ruby/rubygems/rubygems-1.3.7-r3.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/rubygems/rubygems-1.3.7-r2.ebuild,v 1.1 2010/08/03 16:07:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r3.ebuild,v 1.1 2010/08/04 13:47:42 flameeyes Exp $ EAPI="3" @@ -29,8 +29,6 @@ PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )" # rdoc-related stuff, so it's not a mistake. ruby_add_bdepend " test? ( - dev-ruby/rake - dev-ruby/hoe virtual/ruby-minitest dev-ruby/builder !dev-ruby/yard @@ -64,7 +62,8 @@ each_ruby_test() { # Unset RUBYOPT to avoid interferences, bug #158455 et. al. unset RUBYOPT - RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -S rake test || die "tests failed" + RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -Ilib:test \ + -e 'Dir["test/test_*.rb"].each { |tu| require tu }' || die "tests failed" } each_ruby_install() { |