Install ri as ri16 (1.8b-r1) and force ruby16 dependency. See bug #62003.

6 files changed, 54 insertions, 12 deletions

diff --git a/dev-ruby/ri/ChangeLog b/dev-ruby/ri/ChangeLog
index 9c928a2fc9c0..f65714559b1d 100644
--- a/dev-ruby/ri/ChangeLog
+++ b/dev-ruby/ri/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/ri
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ri/ChangeLog,v 1.9 2004/06/25 01:56:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ri/ChangeLog,v 1.10 2004/08/30 17:25:23 usata Exp $
+
+*ri-1.8b-r1 (31 Aug 2004)
+
+  31 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> ri-0.8a.ebuild,
+  +ri-1.8b-r1.ebuild, ri-1.8b.ebuild:
+  Install ri as ri16 (1.8b-r1) and force ruby16 dependency.
+  See bug #62003.
 
   16 Apr 2004; David Holm <dholm@gentoo.org> ri-1.8b.ebuild:
   Added to ~ppc.
diff --git a/dev-ruby/ri/Manifest b/dev-ruby/ri/Manifest
index 49142ecf6a32..07b4218b61f0 100644
--- a/dev-ruby/ri/Manifest
+++ b/dev-ruby/ri/Manifest
@@ -1,6 +1,8 @@
-MD5 a6d24ca550251d4220746fc7e475cc53 ri-0.8a.ebuild 582
-MD5 7136ad3d3ca3c888808b7ed705d2e564 ri-1.8b.ebuild 575
-MD5 129cce7469570948488ce74044463b1f ChangeLog 1431
+MD5 12cbf435994fb43ddc55493c77d11ac3 ChangeLog 1638
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 c5c422a2241a16bb4be36a2e329b29a7 ri-0.8a.ebuild 610
+MD5 f8b3791e424aecf5f2719ebc7616fd1a ri-1.8b.ebuild 600
+MD5 de76a15c6f872b03670a82873693fd5b ri-1.8b-r1.ebuild 796
 MD5 39cb0c876f3d6859867b05cd81b791d2 files/digest-ri-0.8a 56
 MD5 ea3db0b6e9f009bd8681956762a48865 files/digest-ri-1.8b 56
+MD5 ea3db0b6e9f009bd8681956762a48865 files/digest-ri-1.8b-r1 56
diff --git a/dev-ruby/ri/files/digest-ri-1.8b-r1 b/dev-ruby/ri/files/digest-ri-1.8b-r1
new file mode 100644
index 000000000000..3e167a5c0eb6
--- /dev/null
+++ b/dev-ruby/ri/files/digest-ri-1.8b-r1
@@ -0,0 +1 @@
+MD5 8ddf656741badc0e8b63385f4bc93381 ri-1.8b.tgz 140666
diff --git a/dev-ruby/ri/ri-0.8a.ebuild b/dev-ruby/ri/ri-0.8a.ebuild
index 43080e5f7145..d034315866df 100644
--- a/dev-ruby/ri/ri-0.8a.ebuild
+++ b/dev-ruby/ri/ri-0.8a.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ri/ri-0.8a.ebuild,v 1.11 2004/07/14 22:00:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ri/ri-0.8a.ebuild,v 1.12 2004/08/30 17:25:23 usata Exp $
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Ruby Interactive reference"
 HOMEPAGE="http://www.pragmaticprogrammer.com/ruby/downloads/ri.html"
 SRC_URI="http://www.pragmaticprogrammer.com/ruby/downloads/files/${P}.tgz"
@@ -10,11 +9,14 @@ SRC_URI="http://www.pragmaticprogrammer.com/ruby/downloads/files/${P}.tgz"
 SLOT="0"
 LICENSE="Ruby"
 KEYWORDS="x86 alpha"
-IUSE=""
 
+IUSE=""
 DEPEND="=dev-lang/ruby-1.6*"
 
+S=${WORKDIR}/${PN}
+
 src_install () {
+	DESTDIR=${D} ruby16 install.rb || die "install.rb failed"
+
 	dodoc COPYING ChangeLog README
-	DESTDIR=${D} ruby install.rb
 }
diff --git a/dev-ruby/ri/ri-1.8b-r1.ebuild b/dev-ruby/ri/ri-1.8b-r1.ebuild
new file mode 100644
index 000000000000..5e60cf0be2f9
--- /dev/null
+++ b/dev-ruby/ri/ri-1.8b-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ri/ri-1.8b-r1.ebuild,v 1.1 2004/08/30 17:25:23 usata Exp $
+
+DESCRIPTION="Ruby Interactive reference"
+HOMEPAGE="http://www.pragmaticprogrammer.com/ruby/downloads/ri.html"
+SRC_URI="mirror://sourceforge/rdoc/${P}.tgz"
+
+SLOT="0"
+LICENSE="Ruby"
+KEYWORDS="~alpha ~hppa ~mips ~sparc ~x86 ~ppc"
+
+IUSE=""
+DEPEND="=dev-lang/ruby-1.6*"
+RDEPEND="${DEPEND}
+	>=dev-ruby/ruby-config-0.3.1"
+
+S=${WORKDIR}/${PN}
+
+src_install () {
+	DESTDIR=${D} ruby16 install.rb || die "install.rb failed"
+	mv ${D}/usr/bin/ri{,16}	# let ruby-config make symlinks
+
+	dodoc COPYING ChangeLog README
+}
+
+pkg_postinst() {
+	${ROOT}usr/sbin/ruby-config $(readlink ${ROOT}usr/bin/ruby)
+}
diff --git a/dev-ruby/ri/ri-1.8b.ebuild b/dev-ruby/ri/ri-1.8b.ebuild
index af56f3ce3f6f..01d165f8732b 100644
--- a/dev-ruby/ri/ri-1.8b.ebuild
+++ b/dev-ruby/ri/ri-1.8b.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ri/ri-1.8b.ebuild,v 1.8 2004/07/14 22:00:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ri/ri-1.8b.ebuild,v 1.9 2004/08/30 17:25:23 usata Exp $
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Ruby Interactive reference"
 HOMEPAGE="http://www.pragmaticprogrammer.com/ruby/downloads/ri.html"
 SRC_URI="mirror://sourceforge/rdoc/${P}.tgz"
@@ -10,12 +9,14 @@ SRC_URI="mirror://sourceforge/rdoc/${P}.tgz"
 SLOT="0"
 LICENSE="Ruby"
 KEYWORDS="alpha hppa mips sparc x86 ~ppc"
+
 IUSE=""
+DEPEND="=dev-lang/ruby-1.6*"
 
-DEPEND=">=dev-lang/ruby-1.6.2"
+S=${WORKDIR}/${PN}
 
 src_install () {
 
-	DESTDIR=${D} ruby install.rb
+	DESTDIR=${D} ruby16 install.rb || die "install.rb failed"
 	dodoc COPYING ChangeLog README
 }