Unset RUBYOPT before installing rubygems to prevent ruby from failing due to missing...

Package-Manager: portage-2.1.1

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index 47a5a59c4100151207e7f832496b4b75719c5759..8839695c1e1df83d914332c958aa33913320c2fe 100644 (file)
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,11 @@
 # 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.38 2006/12/16 14:40:47 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.39 2006/12/23 01:27:10 pclouds Exp $
+
+  23 Dec 2006; Nguyễn Thái Ngọc Duy <pclouds@gentoo.org>
+  rubygems-0.9.0-r2.ebuild, rubygems-0.8.11-r5.ebuild:
+  Unset RUBYOPT before installing rubygems to prevent ruby from failing due to
+  missing auto_gem (bug #158455). Also warn people when rubygems is removed
 
 *rubygems-0.9.0-r2 (16 Dec 2006)
 

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index d7a7e95c8b1c1429a9de752d0d483c3e6954b43f..4826961e7a80da70f93f2217448387a1ae17c0b4 100644 (file)
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -20,10 +20,10 @@ RMD160 92fb50e21d2d6e7f022f9d1863228858c3f8c826 files/rubygems-0.9.0-build-from-
 SHA256 e698e51d2969f34614c0d8a38869083eb28a6aff6b087e4887472127b4864091 files/rubygems-0.9.0-build-from-yaml.patch 593
 DIST rubygems-0.8.11.tgz 160265 RMD160 381ef7f088b3b439f28797d6d7a3257b3e28d6e4 SHA1 6a7d047349a073f24621e589f50a6a6548f943be SHA256 6ad2b857248aef0e9a5297f708f9988fbade78e16d670109937a73e56fdbae6d
 DIST rubygems-0.9.0.tgz 174321 RMD160 7d2a4ec1a615f608e75c68ee346d957efbb34ed1 SHA1 90d2193e9bb91dbbfbb81ce749abcd827e3b6b53 SHA256 6e90baff5ec951939ffcec569b9e1829e46da56cd320b1de1c8e2f5be828fef0
-EBUILD rubygems-0.8.11-r5.ebuild 1494 RMD160 3899bdc08cb4c1f0ab7b9bbd6f82d8ce30545546 SHA1 73e528262d5669c13fae7a549b0ad16073339462 SHA256 5e517fa0fa94c98208cae9277144b781ec0dc888cb92626573a9b8e2ef247cdd
-MD5 91853e05308ea4e2ea85429b54f12d0d rubygems-0.8.11-r5.ebuild 1494
-RMD160 3899bdc08cb4c1f0ab7b9bbd6f82d8ce30545546 rubygems-0.8.11-r5.ebuild 1494
-SHA256 5e517fa0fa94c98208cae9277144b781ec0dc888cb92626573a9b8e2ef247cdd rubygems-0.8.11-r5.ebuild 1494
+EBUILD rubygems-0.8.11-r5.ebuild 1592 RMD160 11be58813dcfece133d7ece7edad84bf4dcf97bd SHA1 b741fd25a6445cb9a7ac1b2578c16f17dcd940ba SHA256 7cce208d2cabd5ef1b67ad54180fe3b97147edc2349678bbfefa180238857a97
+MD5 59a72f0032391bcefac7450cc1653069 rubygems-0.8.11-r5.ebuild 1592
+RMD160 11be58813dcfece133d7ece7edad84bf4dcf97bd rubygems-0.8.11-r5.ebuild 1592
+SHA256 7cce208d2cabd5ef1b67ad54180fe3b97147edc2349678bbfefa180238857a97 rubygems-0.8.11-r5.ebuild 1592
 EBUILD rubygems-0.8.11.ebuild 899 RMD160 c41058590c5b28e351a83bb00e7e952cca30bd86 SHA1 c586841e8e7b8d913aad0a33620d8cc2571c50b1 SHA256 04013266a83dfdbd3a0dc68f4430da1a7a51f4e314dce1b5c8873f504560e36d
 MD5 ed04a907d861cd1bc1ca9aa0835e355d rubygems-0.8.11.ebuild 899
 RMD160 c41058590c5b28e351a83bb00e7e952cca30bd86 rubygems-0.8.11.ebuild 899
@@ -32,18 +32,18 @@ EBUILD rubygems-0.9.0-r1.ebuild 1553 RMD160 62759f44067be4f0a53e3f4c7d18cb9fd96d
 MD5 df07525c9ce2f70028fd70b42009eb47 rubygems-0.9.0-r1.ebuild 1553
 RMD160 62759f44067be4f0a53e3f4c7d18cb9fd96dd56b rubygems-0.9.0-r1.ebuild 1553
 SHA256 21f76e510e1004cf9b80e5d3ddcf40ce19aa6f3fea5fd5b3cfcffa89e264f8ec rubygems-0.9.0-r1.ebuild 1553
-EBUILD rubygems-0.9.0-r2.ebuild 1591 RMD160 e4b8c2d9def490d7487b19982a123d4cdbdab5f1 SHA1 b4a15d7c9fc35b99013054f62515aa20f70e3d7e SHA256 ed18502f4b6b95208380ee70ef3aab9f071be68c1ccce1c7ad7690c0e4429aad
-MD5 106482f72ac64186631f05301a1c2ca0 rubygems-0.9.0-r2.ebuild 1591
-RMD160 e4b8c2d9def490d7487b19982a123d4cdbdab5f1 rubygems-0.9.0-r2.ebuild 1591
-SHA256 ed18502f4b6b95208380ee70ef3aab9f071be68c1ccce1c7ad7690c0e4429aad rubygems-0.9.0-r2.ebuild 1591
+EBUILD rubygems-0.9.0-r2.ebuild 1929 RMD160 26e256c980f5110587dbdd8a1cdbbdfec733a003 SHA1 8e9bd20a4adf41535deca4df25ca0ba116008d62 SHA256 e325edb077b50ffbfab066d97b683d1a952288f9a952ff702082072979ccb14e
+MD5 ee2ed84e52c72cd5aa134e82ce3169ee rubygems-0.9.0-r2.ebuild 1929
+RMD160 26e256c980f5110587dbdd8a1cdbbdfec733a003 rubygems-0.9.0-r2.ebuild 1929
+SHA256 e325edb077b50ffbfab066d97b683d1a952288f9a952ff702082072979ccb14e rubygems-0.9.0-r2.ebuild 1929
 EBUILD rubygems-0.9.0.ebuild 1507 RMD160 752f72b8c2d186c3f7a5fe21b410f96728d914c1 SHA1 4d505d7e0ab7549f8397d21a3af241476d36c781 SHA256 37dabd14849905a252fb01cba43bb91dcad64e539dba0e5176a9785f2e13a9a3
 MD5 8ece8145793c0f44d3ed9d582a103dd0 rubygems-0.9.0.ebuild 1507
 RMD160 752f72b8c2d186c3f7a5fe21b410f96728d914c1 rubygems-0.9.0.ebuild 1507
 SHA256 37dabd14849905a252fb01cba43bb91dcad64e539dba0e5176a9785f2e13a9a3 rubygems-0.9.0.ebuild 1507
-MISC ChangeLog 5720 RMD160 014e1dd533638e503ee044534485e8b5d122959c SHA1 0e49497184e85c31f1940bbfc6b5d213b65269fb SHA256 a83e7e07d0244432694c53ce0236721585b4e460ef52cef4da1e19235e655579
-MD5 7e01fe8f0026e2cccf0f8b1760d82bc8 ChangeLog 5720
-RMD160 014e1dd533638e503ee044534485e8b5d122959c ChangeLog 5720
-SHA256 a83e7e07d0244432694c53ce0236721585b4e460ef52cef4da1e19235e655579 ChangeLog 5720
+MISC ChangeLog 5993 RMD160 106221aa298fac5e67abffac0428f9a617358979 SHA1 b968d664e5a632fb6764134c87728e51ec9428cc SHA256 4a4405047850f4a94db5e85191e494516b2d38ef0e141ef0d9367fd8fcce24e3
+MD5 fe595f70319b49f46f13150aca6a5986 ChangeLog 5993
+RMD160 106221aa298fac5e67abffac0428f9a617358979 ChangeLog 5993
+SHA256 4a4405047850f4a94db5e85191e494516b2d38ef0e141ef0d9367fd8fcce24e3 ChangeLog 5993
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157

diff --git a/dev-ruby/rubygems/rubygems-0.8.11-r5.ebuild b/dev-ruby/rubygems/rubygems-0.8.11-r5.ebuild
index 8c63103432abe4afbbc294d9e9f49f0c8c8be7d4..45251cb3e73194cd9534e1bff6fee4e0aad89342 100644 (file)
--- a/dev-ruby/rubygems/rubygems-0.8.11-r5.ebuild
+++ b/dev-ruby/rubygems/rubygems-0.8.11-r5.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-r5.ebuild,v 1.7 2006/04/30 16:19:15 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.8.11-r5.ebuild,v 1.8 2006/12/23 01:27:10 pclouds Exp $
 
 inherit ruby
 
@@ -25,6 +25,8 @@ src_compile() {
 }
 
 src_install() {
+       # RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
+       unset RUBYOPT
        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"]')

diff --git a/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild b/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild
index 4ee10acf02bfde9f67d2275c1640eb15f41f26dc..c2567d9f1c5db403163b8b118b1ba4e02a9215a3 100644 (file)
--- a/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild
+++ b/dev-ruby/rubygems/rubygems-0.9.0-r2.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.9.0-r2.ebuild,v 1.1 2006/12/16 14:40:47 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-0.9.0-r2.ebuild,v 1.2 2006/12/23 01:27:10 pclouds Exp $
 
 inherit ruby
 
@@ -27,6 +27,8 @@ src_compile() {
 }
 
 src_install() {
+       # RUBYOPT=-rauto_gem without rubygems installed will cause ruby to fail, bug #158455
+       unset RUBYOPT
        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"]')
@@ -46,4 +48,8 @@ pkg_postrm()
        # If we potentially downgraded, then getting rid of RUBYOPT from env.d is probably a smart idea.
        env-update
        source /etc/profile
+       ewarn "You have removed dev-ruby/rubygems. Ruby applications are unlikely"
+       ewarn "to run in current shells because of missing auto_gem."
+       ewarn "Please source /etc/profile in your shells before using ruby"
+       ewarn "or start new shells"
 }