Un-hack rubygems. With the new version, we're patching only tests and one customisation, all clear for upstream, while we install our own defaults in a separate file exactly as upstream intended.

This new version installs in /usr/local rather than /usr, so that whatever the user installs, it's not going to collide or mess with Portage-installed gems. Also, we no longer do any per-implementation patching, and we only special-case Ruby 1.9 for what concern the auto_gem file (instead of keeping four copies of the same identical file in files/).
Documentation is not currently building right, but tests are executed (they fail for JRuby, that is known.
Note that the -r1 version has been dropped, so for ~alpha and ~arm (which will have to re-keyword -r2) this causes a faux-downgrade to 1.3.7, but the changes in -r1 only related to Ruby 1.9 anyway.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

1 files changed, 4 insertions, 18 deletions

diff --git a/dev-ruby/rubygems/rubygems-1.3.7.ebuild b/dev-ruby/rubygems/rubygems-1.3.7.ebuild
index a532397e8a47..af53c4a697fa 100644
--- a/dev-ruby/rubygems/rubygems-1.3.7.ebuild
+++ b/dev-ruby/rubygems/rubygems-1.3.7.ebuild
@@ -1,10 +1,10 @@
 # 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.ebuild,v 1.1 2010/05/14 19:04:17 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7.ebuild,v 1.2 2010/08/03 16:07:36 flameeyes Exp $
 
 EAPI="2"
 
-USE_RUBY="ruby18 ruby19 ree18 jruby"
+USE_RUBY="ruby18 jruby"
 
 inherit ruby-ng
 
@@ -22,10 +22,7 @@ SLOT="0"
 IUSE="doc server"
 
 # previous versions had rubygems bundled, so it would collide badly
-RDEPEND="
-	ruby_targets_jruby? ( >=dev-java/jruby-1.4.0-r5 )
-	ruby_targets_ruby19? ( >=dev-lang/ruby-1.9.1_p376 )
-"
+RDEPEND="ruby_targets_jruby? ( >=dev-java/jruby-1.4.0-r5 )"
 
 # index_gem_repository.rb
 PDEPEND="server? ( dev-ruby/builder[ruby_targets_ruby18] )"
@@ -37,16 +34,6 @@ all_ruby_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.3-gentoo.patch"
 }
 
-each_ruby_prepare() {
-	case ${RUBY} in
-		*rubyee18)
-			epatch "${FILESDIR}/${P}-rubyee.patch" || die "ree patch failed"
-			;;
-		*)
-			;;
-	esac
-}
-
 each_ruby_install() {
 	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
 	unset RUBYOPT
@@ -67,8 +54,7 @@ each_ruby_install() {
 
 	${RUBY} setup.rb $myconf --destdir="${D}" || die "setup.rb install failed"
 
-	insinto $(ruby_rbconfig_value 'sitelibdir')
-	newins "${FILESDIR}/auto_gem.rb.$(basename ${RUBY})" auto_gem.rb || die	"newins auto_gem failed"
+	doruby "${FILESDIR}/auto_gem.rb"
 }
 
 all_ruby_install() {