virtual/ruby fix

6 files changed, 20 insertions, 44 deletions

diff --git a/dev-ruby/racc/ChangeLog b/dev-ruby/racc/ChangeLog
index e052e700a9d7..1b1982dbc5a2 100644
--- a/dev-ruby/racc/ChangeLog
+++ b/dev-ruby/racc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/racc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/ChangeLog,v 1.12 2004/03/13 19:49:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/ChangeLog,v 1.13 2004/04/10 12:06:11 usata Exp $
+
+  10 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> racc-1.4.3-r1.ebuild,
+  racc-1.4.3.ebuild, racc-1.4.4.ebuild:
+  virtual/ruby fix
 
 *racc-1.4.4 (22 Jan 2004)
 
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 46e52fedbfff..86e9e6e4de67 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,8 +1,6 @@
-MD5 8a9170a4dcc8385b17c9950cca4627c9 racc-1.4.3-r1.ebuild 799
-MD5 4ca23b22ed0dab0cb342669a63fa6cd8 ChangeLog 1816
+MD5 48c1c7ad7d7d48de0bf301094c15a609 racc-1.4.3-r1.ebuild 899
+MD5 446cc337ef9827fbe86c546fb5ceaf60 ChangeLog 1947
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 4c21aaa7f04e3c4ccadfc1e3499e28ad racc-1.4.3.ebuild 948
-MD5 1d641589a62c31e5f3da757d3b27de4c racc-1.4.4.ebuild 655
+MD5 cacec8663eeaf8973f075ad787656dd5 racc-1.4.4.ebuild 675
 MD5 f2857f777672ebb380336153f2910d0c files/digest-racc-1.4.3-r1 66
-MD5 e427d87d0d84f2e6a6913b7b964601ea files/digest-racc-1.4.3 126
 MD5 5d1a0ea8eff898b1990b605ba4f9ecf8 files/digest-racc-1.4.4 66
diff --git a/dev-ruby/racc/files/digest-racc-1.4.3 b/dev-ruby/racc/files/digest-racc-1.4.3
deleted file mode 100644
index 2728b4e7bec5..000000000000
--- a/dev-ruby/racc/files/digest-racc-1.4.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2d240bc75945b647daa4b2f0122b2fce /racc-1.4.3.ebuild 921
-MD5 1262102376133ec638a2e85c5881225a racc-1.4.3-all.tar.gz 105542
diff --git a/dev-ruby/racc/racc-1.4.3-r1.ebuild b/dev-ruby/racc/racc-1.4.3-r1.ebuild
index eec91b61f879..273f9e1f48b9 100644
--- a/dev-ruby/racc/racc-1.4.3-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.3-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.3-r1.ebuild,v 1.3 2004/02/22 22:23:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.3-r1.ebuild,v 1.4 2004/04/10 12:06:11 usata Exp $
+
+inherit ruby
 
 MY_P=${P}-all
 DESCRIPTION="A LALR(1) parser generator for Ruby"
@@ -9,12 +11,15 @@ SRC_URI="http://www.loveruby.net/archive/racc/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha hppa mips sparc x86"
+USE_RUBY="ruby16 ruby18 ruby19"
 IUSE=""
 S=${WORKDIR}/${MY_P}
 
-DEPEND=">=dev-lang/ruby-1.6.1
-	>=dev-ruby/amstd-1.9.5
-	>=dev-ruby/strscan-0.6.5"
+DEPEND="|| ( >=dev-lang/ruby-1.8.0
+		( >=dev-lang/ruby-1.6.1
+		>=dev-ruby/amstd-1.9.5
+		>=dev-ruby/strscan-0.6.5 )
+		dev-lang/ruby-cvs )"
 
 src_compile() {
 	ruby setup.rb config --without=amstd,strscan || die
diff --git a/dev-ruby/racc/racc-1.4.3.ebuild b/dev-ruby/racc/racc-1.4.3.ebuild
deleted file mode 100644
index 0628e44186ad..000000000000
--- a/dev-ruby/racc/racc-1.4.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.3.ebuild,v 1.7 2004/02/22 22:23:09 agriffis Exp $
-
-S=${WORKDIR}/${P}-all
-DESCRIPTION="LALR parser generator for Ruby"
-SRC_URI="http://www.loveruby.net/archive/racc/${P}-all.tar.gz"
-HOMEPAGE="http://www.loveruby.net/en/racc.html"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha hppa mips sparc x86"
-IUSE=""
-SLOT="0"
-
-DEPEND=">=dev-lang/ruby-1.6.1
-	>=dev-ruby/amstd-1.9.5"
-
-src_compile() {
-	ruby setup.rb config --without=amstd || die
-	ruby setup.rb setup || die
-}
-
-src_install () {
-	# It appears that this reconfig doesn't hurt anything.
-	# The --prefix and --rb-dir args don't work on the install line.
-	RB_DIR=`ruby -e 'require "rbconfig"; puts Config::CONFIG["sitelibdir"]'`
-	ruby setup.rb config \
-		--prefix=${D}/usr \
-		--rb-dir=${D}${RB_DIR} || die
-	ruby setup.rb install || die
-}
diff --git a/dev-ruby/racc/racc-1.4.4.ebuild b/dev-ruby/racc/racc-1.4.4.ebuild
index 131032b21b74..82d71bca533c 100644
--- a/dev-ruby/racc/racc-1.4.4.ebuild
+++ b/dev-ruby/racc/racc-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.4.ebuild,v 1.3 2004/03/13 19:49:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.4.4.ebuild,v 1.4 2004/04/10 12:06:11 usata Exp $
 
 inherit ruby
 
@@ -19,4 +19,5 @@ DEPEND="|| ( >=dev-lang/ruby-1.8
 		( =dev-lang/ruby-1.6*
 		>=dev-ruby/amstd-1.9.5
 		>=dev-ruby/strscan-0.6.5 )
+		dev-lang/ruby-cvs
 	)"