Fixed bug #68901.

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 94102692effff25cf3078bd2b826eb77d7930750..75b77cb9c7488d0cc503700da9270b88d74c97ff 100644 (file)
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.97 2004/10/20 17:02:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.98 2004/10/27 08:12:46 usata Exp $
+
+  27 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-1.8.2_pre2.ebuild:
+  Fixed bug #68901.
 
   20 Oct 2004; <agriffis@gentoo.org> files/ruby-rdoc-gentoo.diff:
   Fix rdoc patch to build all documentation instead of just part of it. This is

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index a88d1914827fe8a5a22265ea938d74737f36074a..86233bd2bfd027ef1a7543198d9089799ec6d9fc 100644 (file)
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,14 +1,14 @@
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 f5f52fddda233f187521a2543738cc59 ruby-1.8.2_pre2.ebuild 3419
 MD5 8f0fe45b59ec7a1bf9d07cf6e42828ed ruby-1.6.8-r11.ebuild 2014
-MD5 a3c17148005564e47795b4928b35c61a ruby-1.8.0-r7.ebuild 2817
-MD5 066f83ca4c4a769c1c5c9a3922858d37 ruby-1.8.2_pre2.ebuild 3399
 MD5 4b89f50a9cbac9ffab8b388d96574ff9 ruby-1.8.1-r7.ebuild 2870
-MD5 0050db79487284102268e49aca4e82eb ChangeLog 15660
-MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
+MD5 53d2e0053b26577f8ce296ffd65b9d8e ChangeLog 15751
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 a3c17148005564e47795b4928b35c61a ruby-1.8.0-r7.ebuild 2817
+MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-fix-ppc.patch 593
+MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473
+MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
 MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
 MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
 MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
-MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
-MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
-MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473

diff --git a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
index e5dfddf8bf25b65c9c9b3b2634ce940682ad0704..59a77eec0604ce16be55fa1de48b0046ad945558 100644 (file)
--- a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre2.ebuild,v 1.18 2004/10/27 04:51:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre2.ebuild,v 1.19 2004/10/27 08:12:46 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
@@ -40,7 +40,7 @@ src_unpack() {
        if use cjk ; then
                einfo "Applying ${ONIGURUMA}"
                pushd ${WORKDIR}/oniguruma
-               if use ppc || use ppc64 ; then
+               if use ppc || use ppc64 || use alpha ; then
                        epatch ${FILESDIR}/oniguruma-2.3.1-fix-ppc.patch
                fi
                econf --with-rubydir=${S} || die "econf failed"
@@ -84,7 +84,7 @@ src_compile() {
 
 src_install() {
        LD_LIBRARY_PATH=${D}/usr/lib
-       RUBYLIB=${D}/usr/lib/ruby/${SLOT}
+       RUBYLIB="${S}:${D}/usr/lib/ruby/${SLOT}"
        for d in $(find ${S}/ext -type d) ; do
                RUBYLIB="${RUBYLIB}:$d"
        done