Fixed ri installation; bug #62003.

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index a0816c676d1f48f4b0904f8092fb1a6c2dcdb3b1..5798b58545fd3354d898beb6cae01bb0e6a2e489 100644 (file)
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # 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.110 2004/11/11 15:33:21 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.111 2004/11/12 16:53:56 usata Exp $
+
+  13 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  files/ruby-rdoc-gentoo.diff, ruby-1.8.2_pre2.ebuild,
+  ruby-1.8.2_pre3.ebuild:
+  Fixed ri installation; bug #62003.
 
   11 Nov 2004; Olivier Crete <tester@gentoo.org> ruby-1.8.2_pre3.ebuild:
   Stable on x86, bug 69985

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index f6cedaa7d7550e433a8a24e69e00c16650c97687..03e54f1ea9bc1b7a18bd3d5bfb18b93495d909a8 100644 (file)
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 870e07f9c9e199ebf992d8a92b69f02d ruby-1.6.8-r12.ebuild 1939
+MD5 24728461214667483343eb9e6984304e ChangeLog 17633
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 MD5 058e9207055f949fa2f86ed07133c2cc ruby-1.8.1-r7.ebuild 2830
-MD5 25efa52f2b3ffec970596323b389dbf9 ChangeLog 17466
-MD5 10085510b8dc690546ac99fd32ec988e ruby-1.8.2_pre2.ebuild 3366
+MD5 870e07f9c9e199ebf992d8a92b69f02d ruby-1.6.8-r12.ebuild 1939
 MD5 4ff0d64ae0b5553a20e403ccebac1a46 ruby-1.6.8-r11.ebuild 1973
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 23275105da1c807eb72ac2be9cd10f01 ruby-1.8.2_pre2.ebuild 3368
 MD5 4f420e12003a91bd479563bef413fe88 ruby-1.8.0-r7.ebuild 2777
-MD5 74fcfdf4e2941f632fad2f983a81540b ruby-1.8.2_pre3.ebuild 3454
-MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
+MD5 dba7b48cab6ddedbe26a8e2c7d10d6ba ruby-1.8.2_pre3.ebuild 3455
 MD5 19938f076658cc6b4edb91d62ae357f0 files/digest-ruby-1.8.0-r7 125
-MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
+MD5 3e8d8ff915f444c975169748675b06c9 files/digest-ruby-1.8.1-r7 137
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
-MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
-MD5 d3cbd264b66bd70c262aaf9e4a79aa4b files/digest-ruby-1.8.2_pre3 134
+MD5 d05f63da27634456886e7c924eaf96da files/ruby-1.6.8-fix-x86_64.patch 431
 MD5 00ccb2b51acb8e90488b9bd2f8bf2c32 files/digest-ruby-1.6.8-r11 136
-MD5 d604e46a2d8a4c411b03c101e36ee29a files/ruby-rdoc-gentoo.diff 473
-MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
-MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
 MD5 a5d6f26168583bd4fd399f0855323175 files/digest-ruby-1.8.2_pre2 134
+MD5 a061fe32b8e0538c203bccebcd2ad8ac files/ruby-1.6.8-20040728-20041024.diff 3094
+MD5 c20ec6eaf6847e4eb46d8865241f1016 files/ruby-1.8.0-CGI::Session.patch 801
+MD5 844ffd93bddeeb9decf86b49669423e8 files/digest-ruby-1.6.8-r12 136
+MD5 e7fc14a584186eb629eddc20bc853a24 files/ruby-rdoc-gentoo.diff 455
+MD5 d3cbd264b66bd70c262aaf9e4a79aa4b files/digest-ruby-1.8.2_pre3 134
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBk4ZdwDHaUUJ0mYMRAghUAKCcUhySp22qOSPNY6ph3GivRcfbjwCfa4nk
-ukRc74e+sObHGO16CmFJ9QA=
-=3KVs
+iD8DBQFBlOkfVWNWqTUmv+0RAiqaAJ9c8Rymbibuvfrph/TCfPnL/g16TgCfd1dQ
+rHfwLG412QByvy77FuogT3Y=
+=ux6e
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ruby/files/ruby-rdoc-gentoo.diff b/dev-lang/ruby/files/ruby-rdoc-gentoo.diff
index 3cfcca0d4f99f973f193ff9a37d23759761e7667..7554050672f99487a98b04a28b0fe7f26dbe3468 100644 (file)
--- a/dev-lang/ruby/files/ruby-rdoc-gentoo.diff
+++ b/dev-lang/ruby/files/ruby-rdoc-gentoo.diff
@@ -1,11 +1,11 @@
---- Makefile.in.orig   2004-08-31 23:07:04.000000000 +0900
-+++ Makefile.in        2004-08-31 23:07:04.000000000 +0900
+--- Makefile.in.orig   2004-07-07 15:54:37.000000000 +0900
++++ Makefile.in        2004-11-13 00:53:52.000000000 +0900
 @@ -151,7 +151,7 @@
  
  install-doc:
                @echo Generating RDoc documentation
 -              $(bindir)/$(PROGRAM) $(srcdir)/bin/rdoc --all --ri-system $(srcdir)
-+              cd $(srcdir)/lib && find . -name \*.rb -print0 | xargs -0 $(DESTDIR)$(bindir)/$(PROGRAM) ../bin/rdoc --all --ri-system
++              $(DESTDIR)$(bindir)/$(PROGRAM) $(srcdir)/bin/rdoc --all --ri-system $(srcdir) `find lib -name \*.rb`
  
  clean-ext:
                @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) clean 2> /dev/null || true

diff --git a/dev-lang/ruby/ruby-1.8.2_pre2.ebuild b/dev-lang/ruby/ruby-1.8.2_pre2.ebuild
index 77dbc0879bb30b793513b685627d78591f89eaf8..976c0a6412889c9ce0ad127e7d8f1cc742368d7c 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.20 2004/11/09 20:22:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre2.ebuild,v 1.21 2004/11/12 16:53:56 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 MY_P=${P/_pre/-preview}
@@ -119,7 +119,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       if use ppc-macos ; then
+       if ! use ppc-macos ; then
                if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
                        ${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
                fi

diff --git a/dev-lang/ruby/ruby-1.8.2_pre3.ebuild b/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
index 60a5b7cd4f37fd43d307504054033378be8a2fee..344be3b2c46b20dc3a46cee265948e0921017541 100644 (file)
--- a/dev-lang/ruby/ruby-1.8.2_pre3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.2_pre3.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_pre3.ebuild,v 1.10 2004/11/11 15:33:21 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.2_pre3.ebuild,v 1.11 2004/11/12 16:53:56 usata Exp $
 
 ONIGURUMA="onigd2_3_2"
 
@@ -120,7 +120,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       if use ppc-macos ; then
+       if ! use ppc-macos ; then
                if [ ! -n "$(readlink ${ROOT}usr/bin/ruby)" ] ; then
                        ${ROOT}usr/sbin/ruby-config ruby${SLOT/./}
                fi