Fixed RI TypeError, closing bug #48702. Fixed DEPEND and removed old ebuild.

6 files changed, 20 insertions, 49 deletions

diff --git a/dev-ruby/rbbr/ChangeLog b/dev-ruby/rbbr/ChangeLog
index bca6df98bbab..df42c274521f 100644
--- a/dev-ruby/rbbr/ChangeLog
+++ b/dev-ruby/rbbr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rbbr
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbbr/ChangeLog,v 1.5 2004/04/16 15:03:20 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbbr/ChangeLog,v 1.6 2004/04/24 17:58:54 usata Exp $
+
+  25 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> rbbr-0.4.0.ebuild,
+  rbbr-0.5.1.ebuild, rbbr-0.6.0.ebuild:
+  Fixed RI TypeError, closing bug #48702. Fixed DEPEND and removed
+  old ebuild.
 
   16 Apr 2004; David Holm <dholm@gentoo.org> rbbr-0.6.0.ebuild:
   Added to ~ppc.
diff --git a/dev-ruby/rbbr/Manifest b/dev-ruby/rbbr/Manifest
index 2f3a1b96c915..3d9192c09a87 100644
--- a/dev-ruby/rbbr/Manifest
+++ b/dev-ruby/rbbr/Manifest
@@ -1,8 +1,6 @@
-MD5 389890ba6b215a42f8f493613e1ba723 ChangeLog 831
+MD5 849d3accbbf76a8f5acdf51c9b9b75f8 ChangeLog 1021
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 ab7e30971dcdd259168622bddfc84a73 rbbr-0.4.0.ebuild 997
-MD5 2a9815a71d42d8f463109d7e097e3d76 rbbr-0.5.1.ebuild 924
-MD5 723ad36652b27df7aabffad56a484d89 rbbr-0.6.0.ebuild 929
-MD5 b3b40e1b66437bf7e76e648b6cbfd981 files/digest-rbbr-0.4.0 128
+MD5 dd5485c5a30c803771b8e823cfa78565 rbbr-0.5.1.ebuild 952
+MD5 66d43576f31e889b02dd13df643b7325 rbbr-0.6.0.ebuild 1039
 MD5 4dd6d22182125b52764eba68c85983ad files/digest-rbbr-0.5.1 70
 MD5 de25fedd264f1a4c774374fea6ce760b files/digest-rbbr-0.6.0 70
diff --git a/dev-ruby/rbbr/files/digest-rbbr-0.4.0 b/dev-ruby/rbbr/files/digest-rbbr-0.4.0
deleted file mode 100644
index 6ceb66637cd2..000000000000
--- a/dev-ruby/rbbr/files/digest-rbbr-0.4.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 556326d2aac1ab848e1b25d86c6216d5 ruby-gnome2-api.tar.gz 215820
-MD5 9971c0b2ad29b763ce0081825abd272c rbbr-0.4.0.tar.gz 33655
diff --git a/dev-ruby/rbbr/rbbr-0.4.0.ebuild b/dev-ruby/rbbr/rbbr-0.4.0.ebuild
deleted file mode 100644
index 1bbc8b02b0da..000000000000
--- a/dev-ruby/rbbr/rbbr-0.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.; acid DOT punk AT gmx DOT net
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbbr/rbbr-0.4.0.ebuild,v 1.2 2004/03/24 23:30:30 mholzer Exp $
-
-DESCRIPTION="Ruby Browser for modules/classes hierarchy and their constants and methods"
-HOMEPAGE="http://ruby-gnome2.sourceforge.jp/hiki.cgi?rbbr"
-SRC_URI="http://ruby-gnome2.sourceforge.jp/data/ruby-gnome2-api.tar.gz
-	mirror://sourceforge/ruby-gnome2/${P}.tar.gz"
-
-KEYWORDS="~x86"
-SLOT="0"
-LICENSE="Ruby"
-
-DEPEND=">=dev-lang/ruby-1.8.0
-	>=dev-ruby/ruby-gnome2-0.7.0
-	>=dev-ruby/ri-0.8a"
-
-
-src_unpack() {
-	unpack ${A} ruby-gnome2-api.tar.gz
-	cp -f ruby-gnome2-api/* rbbr-0.4.0/data/rbbr/rd/ || die "cp api failed"
-}
-
-src_compile() {
-	ruby install.rb config || die "install.rb config failed"
-	ruby install.rb setup || die "install.rb setup failed"
-}
-
-src_install() {
-	ruby install.rb install --prefix=${D} || die "install.rb install failed"
-}
diff --git a/dev-ruby/rbbr/rbbr-0.5.1.ebuild b/dev-ruby/rbbr/rbbr-0.5.1.ebuild
index 1c0f96b2cf89..d7288423338c 100644
--- a/dev-ruby/rbbr/rbbr-0.5.1.ebuild
+++ b/dev-ruby/rbbr/rbbr-0.5.1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.; acid DOT punk AT gmx DOT net
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbbr/rbbr-0.5.1.ebuild,v 1.2 2004/01/23 07:49:25 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbbr/rbbr-0.5.1.ebuild,v 1.3 2004/04/24 17:58:54 usata Exp $
 
 DESCRIPTION="Ruby Browser for modules/classes hierarchy and their constants and methods"
 HOMEPAGE="http://ruby-gnome2.sourceforge.jp/hiki.cgi?rbbr"
 SRC_URI="mirror://sourceforge/ruby-gnome2/${P}-withapi.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="Ruby"
 IUSE="nls cjk"
 
-DEPEND=">=dev-lang/ruby-1.8.0
-	 >=dev-ruby/ruby-gnome2-0.7.0
-	 >=dev-ruby/ri-0.8a
-	 nls? ( >=dev-ruby/ruby-gettext-0.5.3 )
-	 cjk? ( dev-ruby/refe )"
+DEPEND="|| ( >=dev-lang/ruby-1.8.0 dev-lang/ruby-cvs )
+	>=dev-ruby/ruby-gnome2-0.7.0
+	>=dev-ruby/ri-0.8a
+	nls? ( >=dev-ruby/ruby-gettext-0.5.3 )
+	cjk? ( >=dev-ruby/refe-0.7.2 )"
 
 S="${WORKDIR}/${P}-withapi"
 
diff --git a/dev-ruby/rbbr/rbbr-0.6.0.ebuild b/dev-ruby/rbbr/rbbr-0.6.0.ebuild
index 11bafba334e9..e4f186a357ec 100644
--- a/dev-ruby/rbbr/rbbr-0.6.0.ebuild
+++ b/dev-ruby/rbbr/rbbr-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.; acid DOT punk AT gmx DOT net
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbbr/rbbr-0.6.0.ebuild,v 1.2 2004/04/16 15:03:20 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbbr/rbbr-0.6.0.ebuild,v 1.3 2004/04/24 17:58:54 usata Exp $
 
 DESCRIPTION="Ruby Browser for modules/classes hierarchy and their constants and methods"
 HOMEPAGE="http://ruby-gnome2.sourceforge.jp/hiki.cgi?rbbr"
@@ -11,11 +11,11 @@ SLOT="0"
 LICENSE="Ruby"
 IUSE="nls cjk"
 
-DEPEND=">=dev-lang/ruby-1.8.0
+DEPEND="|| ( >=dev-lang/ruby-1.8.0 dev-lang/ruby-cvs )
 	 >=dev-ruby/ruby-gnome2-0.7.0
 	 >=dev-ruby/ri-0.8a
 	 nls? ( >=dev-ruby/ruby-gettext-0.5.3 )
-	 cjk? ( dev-ruby/refe )"
+	 cjk? ( >=dev-ruby/refe-0.7.2 )"
 
 S="${WORKDIR}/${P}-withapi"
 
@@ -26,4 +26,5 @@ src_compile() {
 
 src_install() {
 	ruby install.rb install --prefix=${D} || die "install.rb install failed"
+	dosed "/LIB_DIR/s%/[0-9]\.[0-9]%%" /usr/lib/ruby/site_ruby/*/rbbr/config.rb
 }