I think this fixes the rubygems issues that have been plaguing me

Package-Manager: portage-2.1_pre4-r1

9 files changed, 47 insertions, 56 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index 50f49e421ec0..d4a3fe12b71a 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.23 2006/02/22 18:17:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.24 2006/02/22 18:55:38 caleb Exp $
+
+*rubygems-0.8.11-r4 (22 Feb 2006)
+
+  22 Feb 2006; Caleb Tennis <caleb@gentoo.org> files/10rubygems,
+  +files/auto_gem.rb, -rubygems-0.8.11-r1.ebuild,
+  -rubygems-0.8.11-r2.ebuild, +rubygems-0.8.11-r4.ebuild:
+  Okay, I think this is a good fix for the rubygems issue
 
   22 Feb 2006; Caleb Tennis <caleb@gentoo.org> rubygems-0.8.11-r3.ebuild:
   Remove ruby_with_gems and message saying it's a good idea to use
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 77c2b7f72267..30b226081d10 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,24 +1,24 @@
-MD5 4f22475e75d38a6c06422cdc433fd07c ChangeLog 3442
-RMD160 fab126cc2ac0274793b343a179197ee9abfda90b ChangeLog 3442
-SHA256 de539aa3e382a9de8b737eadf4cc821f55179681de4fe789b753c274be2e11d5 ChangeLog 3442
-MD5 66514ac9a1c12f38108043106e4603e6 files/10rubygems 20
-RMD160 799688f4b80fb3eaba42cefec6f036deedaf274e files/10rubygems 20
-SHA256 64c449f40f16f873281311f1118bb7edb5e04b126a9c19ca1cc255158913d889 files/10rubygems 20
+MD5 561d0d6ad4b580ed97df07ab0e3279b2 ChangeLog 3709
+RMD160 da70439cc8dbfab0f991d86ff4acf2969f391bdf ChangeLog 3709
+SHA256 71a83f5376ab925f24f5bece35f3748282ed66e9e6e4b6368e32184081ef2cd6 ChangeLog 3709
+MD5 15ffbd574f0d1b8f0e79d060c92749b4 files/10rubygems 21
+RMD160 02441be7de6307bbb859fbc2bf5891809fe9ecf8 files/10rubygems 21
+SHA256 8c30de9ba7f327237af47f85d8f7f6701d34c9a8780ff7303244667568ca5833 files/10rubygems 21
+MD5 fafe3ad43fd0c53f7f10ec7736a90c4f files/auto_gem.rb 159
+RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 files/auto_gem.rb 159
+SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc files/auto_gem.rb 159
 MD5 8bbad53ea0e9bb1a53892ef892176238 files/digest-rubygems-0.8.10 64
 RMD160 d1ab0ab3ff7a75c9fe8e95c31196d780ceea270d files/digest-rubygems-0.8.10 64
 SHA256 29987b34f3249328eb94696ff6adb4b57163c6ffb40f2f0eb1e5abc61640b185 files/digest-rubygems-0.8.10 64
 MD5 c4cfa55864944c9d028da394e1565262 files/digest-rubygems-0.8.11 64
 RMD160 ff4b2fbb7c1c3fc5f345a4acf552e8825ac715ba files/digest-rubygems-0.8.11 64
 SHA256 5011af7fd72b1f564be4cdde61e319e1ef9489e9348ed79b3ca5875f79e49eec files/digest-rubygems-0.8.11 64
-MD5 c4cfa55864944c9d028da394e1565262 files/digest-rubygems-0.8.11-r1 64
-RMD160 ff4b2fbb7c1c3fc5f345a4acf552e8825ac715ba files/digest-rubygems-0.8.11-r1 64
-SHA256 5011af7fd72b1f564be4cdde61e319e1ef9489e9348ed79b3ca5875f79e49eec files/digest-rubygems-0.8.11-r1 64
-MD5 c4cfa55864944c9d028da394e1565262 files/digest-rubygems-0.8.11-r2 64
-RMD160 ff4b2fbb7c1c3fc5f345a4acf552e8825ac715ba files/digest-rubygems-0.8.11-r2 64
-SHA256 5011af7fd72b1f564be4cdde61e319e1ef9489e9348ed79b3ca5875f79e49eec files/digest-rubygems-0.8.11-r2 64
 MD5 0e906a2c3de4ace9bd223e521501d86e files/digest-rubygems-0.8.11-r3 238
 RMD160 0924f6a1ce7439f950514224be9a41a421db4221 files/digest-rubygems-0.8.11-r3 238
 SHA256 e671d8919c23100c53c004393e4e030ff284ee0fef8021d6611db28fd8a90da3 files/digest-rubygems-0.8.11-r3 238
+MD5 0e906a2c3de4ace9bd223e521501d86e files/digest-rubygems-0.8.11-r4 238
+RMD160 0924f6a1ce7439f950514224be9a41a421db4221 files/digest-rubygems-0.8.11-r4 238
+SHA256 e671d8919c23100c53c004393e4e030ff284ee0fef8021d6611db28fd8a90da3 files/digest-rubygems-0.8.11-r4 238
 MD5 664d3edb96dfbb4c5e2a3f6cbb12d566 files/no_post_install.patch 204
 RMD160 e903ea665032f9695b7a05ec4b7b46f1351afcc2 files/no_post_install.patch 204
 SHA256 85fb8720c63c3b3ff5257acd7b3be9a370f13364c800189006f7b9d4954ad536 files/no_post_install.patch 204
@@ -28,15 +28,12 @@ SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata
 MD5 be4b9fbb36f41acbaccc1e403faaa500 rubygems-0.8.10.ebuild 902
 RMD160 85b8927e3c2de4b17870b89d02b926b90fd74c9d rubygems-0.8.10.ebuild 902
 SHA256 169a67a25469071cb9fb9c888e1f2cb54d3333c61ea539848714d14f101ceb79 rubygems-0.8.10.ebuild 902
-MD5 673f3d86269b325f58b8bb8ef1d4f1c5 rubygems-0.8.11-r1.ebuild 993
-RMD160 4bb6f499c85f5d8116d910770679292da7c359ed rubygems-0.8.11-r1.ebuild 993
-SHA256 e948594234cf4f26a626d0fd1f670c2d0877c7138ec68cf7fafe16342a9377a8 rubygems-0.8.11-r1.ebuild 993
-MD5 586158c52800766e93bd3fbdc739fc3f rubygems-0.8.11-r2.ebuild 962
-RMD160 fcaf84d30f469360edeaeacc938509b872e53c8d rubygems-0.8.11-r2.ebuild 962
-SHA256 7507312129d1e36167bc8d37b3252f882b4db82a4378d424241e8a72bde787d0 rubygems-0.8.11-r2.ebuild 962
-MD5 e3bf8c60b5fc929ac94931bc38182d79 rubygems-0.8.11-r3.ebuild 993
-RMD160 8e76b23894314f8bfebd91a3711671b208fde82d rubygems-0.8.11-r3.ebuild 993
-SHA256 69b09954a52344b66a7813572a2d94f143cf1e6efa3d061087ed3788987e8793 rubygems-0.8.11-r3.ebuild 993
+MD5 a514382afe09b38328f2a2149482276a rubygems-0.8.11-r3.ebuild 1367
+RMD160 7fc4333c204e9ee86aa8ec98bd7d242e3fdaf5dc rubygems-0.8.11-r3.ebuild 1367
+SHA256 cf8844ebad6650a267a924d50ca0fa6833431c4ad8a387534daa5cf97c21edaa rubygems-0.8.11-r3.ebuild 1367
+MD5 f7da794af1706fbfc85ba6c5228ff2c3 rubygems-0.8.11-r4.ebuild 1330
+RMD160 3a624d56948c5a01e87791556841ce646b1115d2 rubygems-0.8.11-r4.ebuild 1330
+SHA256 4675c6b863ed929982b3b65aaecb33d0e10a4f66747511a0ee0a1943ebeda53e rubygems-0.8.11-r4.ebuild 1330
 MD5 ed04a907d861cd1bc1ca9aa0835e355d rubygems-0.8.11.ebuild 899
 RMD160 c41058590c5b28e351a83bb00e7e952cca30bd86 rubygems-0.8.11.ebuild 899
 SHA256 04013266a83dfdbd3a0dc68f4430da1a7a51f4e314dce1b5c8873f504560e36d rubygems-0.8.11.ebuild 899
diff --git a/dev-ruby/rubygems/files/10rubygems b/dev-ruby/rubygems/files/10rubygems
index fa086b043d35..f5122167c704 100644
--- a/dev-ruby/rubygems/files/10rubygems
+++ b/dev-ruby/rubygems/files/10rubygems
@@ -1 +1 @@
-RUBYOPT="-rubygems"
+RUBYOPT="-rauto_gem"
diff --git a/dev-ruby/rubygems/files/auto_gem.rb b/dev-ruby/rubygems/files/auto_gem.rb
new file mode 100644
index 000000000000..5c4f540a92df
--- /dev/null
+++ b/dev-ruby/rubygems/files/auto_gem.rb
@@ -0,0 +1,7 @@
+# This file is installed by Gentoo's rubygems package.
+# It's intended to help automate the loading of rubygems
+
+begin
+require 'rubygems'
+rescue LoadError
+end
diff --git a/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r1 b/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r1
deleted file mode 100644
index 5d069befbe71..000000000000
--- a/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa363b428c4c1fc2e076a4ff77b957d7 rubygems-0.8.11.tgz 160265
diff --git a/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r2 b/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r2
deleted file mode 100644
index 5d069befbe71..000000000000
--- a/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa363b428c4c1fc2e076a4ff77b957d7 rubygems-0.8.11.tgz 160265
diff --git a/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r4 b/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r4
new file mode 100644
index 000000000000..337bb332079b
--- /dev/null
+++ b/dev-ruby/rubygems/files/digest-rubygems-0.8.11-r4
@@ -0,0 +1,3 @@
+MD5 aa363b428c4c1fc2e076a4ff77b957d7 rubygems-0.8.11.tgz 160265
+RMD160 381ef7f088b3b439f28797d6d7a3257b3e28d6e4 rubygems-0.8.11.tgz 160265
+SHA256 6ad2b857248aef0e9a5297f708f9988fbade78e16d670109937a73e56fdbae6d rubygems-0.8.11.tgz 160265
diff --git a/dev-ruby/rubygems/rubygems-0.8.11-r2.ebuild b/dev-ruby/rubygems/rubygems-0.8.11-r2.ebuild
deleted file mode 100644
index 7b4bba37faf9..000000000000
--- a/dev-ruby/rubygems/rubygems-0.8.11-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.8.11-r2.ebuild,v 1.1 2006/01/02 22:37:11 caleb Exp $
-
-inherit ruby
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="Ruby"
-
-# The URL depends implicitly on the version, unfortunately. Even if you
-# change the filename on the end, it still downloads the same file.
-SRC_URI="http://rubyforge.org/frs/download.php/5207/${P}.tgz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
-SLOT="0"
-IUSE=""
-DEPEND=">=dev-lang/ruby-1.8"
-PATCHES="${FILESDIR}/no_post_install.patch"
-USE_RUBY="ruby18"
-
-src_compile() {
-	return
-}
-
-src_install() {
-	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["MAJOR"] + "." + Config::CONFIG["MINOR"]')
-	GEM_HOME=${D}/usr/lib/ruby/gems/$ver ruby_src_install
-	keepdir /usr/lib/ruby/gems/$ver/doc
-}
diff --git a/dev-ruby/rubygems/rubygems-0.8.11-r1.ebuild b/dev-ruby/rubygems/rubygems-0.8.11-r4.ebuild
index 4d97d625317a..61e025fa63f9 100644
--- a/dev-ruby/rubygems/rubygems-0.8.11-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-0.8.11-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.8.11-r1.ebuild,v 1.3 2006/01/02 22:37:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.8.11-r4.ebuild,v 1.1 2006/02/22 18:55:38 caleb Exp $
 
 inherit ruby
 
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
 SLOT="0"
 IUSE=""
 DEPEND=">=dev-lang/ruby-1.8"
+
 PATCHES="${FILESDIR}/no_post_install.patch"
 USE_RUBY="ruby18"
 
@@ -26,6 +27,14 @@ src_compile() {
 src_install() {
 	ver=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["MAJOR"] + "." + Config::CONFIG["MINOR"]')
 	GEM_HOME=${D}/usr/lib/ruby/gems/$ver ruby_src_install
+	cp ${FILESDIR}/auto_gem.rb ${D}/$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]')
 	keepdir /usr/lib/ruby/gems/$ver/doc
 	doenvd ${FILESDIR}/10rubygems
 }
+
+pkg_postinst()
+{
+	ewarn "If you have previously switched to using ruby18_with_gems using ruby-config, this"
+	ewarn "package has removed that file and makes it unnecessary anymore.  Please use ruby-config"
+	ewarn "to revert back to ruby18."
+}