Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-ruby/amstd/Manifest3
-rw-r--r--dev-ruby/amstd/amstd-2.0.0-r1.ebuild17
-rw-r--r--dev-ruby/amstd/files/digest-amstd-2.0.0-r11
-rw-r--r--dev-ruby/ncurses-ruby/Manifest2
-rw-r--r--dev-ruby/ncurses-ruby/ncurses-ruby-0.8.ebuild4
-rw-r--r--dev-ruby/ruby-eb/Manifest2
-rw-r--r--dev-ruby/ruby-eb/ruby-eb-2.3.ebuild4
-rw-r--r--dev-ruby/ruby-mmap/Manifest2
-rw-r--r--dev-ruby/ruby-mmap/ruby-mmap-0.2.2.ebuild4
-rw-r--r--dev-ruby/ruby-tcpwrap/Manifest2
-rw-r--r--dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6.ebuild4
-rw-r--r--dev-ruby/ruby-zlib/Manifest2
-rw-r--r--dev-ruby/ruby-zlib/ruby-zlib-0.6.0.ebuild4
-rw-r--r--dev-ruby/sary-ruby/Manifest2
-rw-r--r--dev-ruby/sary-ruby/sary-ruby-0.5_pre20030507.ebuild4
-rw-r--r--eclass/ruby.eclass61
16 files changed, 82 insertions, 36 deletions
diff --git a/dev-ruby/amstd/Manifest b/dev-ruby/amstd/Manifest
index 7e7645eb4c2a..203490755925 100644
--- a/dev-ruby/amstd/Manifest
+++ b/dev-ruby/amstd/Manifest
@@ -1,3 +1,6 @@
MD5 19b71f0c944af7211ba95b08fc59a504 ChangeLog 1278
MD5 23393eb9df9ff52abc7ad9c6256a8707 amstd-2.0.0.ebuild 685
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 b61dc5f2640e52073c2ca3d307c5ef4d amstd-2.0.0-r1.ebuild 527
MD5 30a9701cc28cb91eef419c5b9ff9ff66 files/digest-amstd-2.0.0 62
+MD5 30a9701cc28cb91eef419c5b9ff9ff66 files/digest-amstd-2.0.0-r1 62
diff --git a/dev-ruby/amstd/amstd-2.0.0-r1.ebuild b/dev-ruby/amstd/amstd-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..4870490eaa0f
--- /dev/null
+++ b/dev-ruby/amstd/amstd-2.0.0-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amstd/amstd-2.0.0-r1.ebuild,v 1.1 2003/11/16 19:27:24 usata Exp $
+
+inherit ruby
+
+DESCRIPTION="Ruby utility collection by Minero Aoki"
+HOMEPAGE="http://www.loveruby.net/en/amstd.html"
+SRC_URI="http://www.loveruby.net/archive/amstd/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
+
+IUSE=""
+USE_RUBY="any"
+DEPEND=">=dev-lang/ruby-1.6"
diff --git a/dev-ruby/amstd/files/digest-amstd-2.0.0-r1 b/dev-ruby/amstd/files/digest-amstd-2.0.0-r1
new file mode 100644
index 000000000000..de03c287facb
--- /dev/null
+++ b/dev-ruby/amstd/files/digest-amstd-2.0.0-r1
@@ -0,0 +1 @@
+MD5 0b9b409d57a4b2ebb17990422fbb6800 amstd-2.0.0.tar.gz 20057
diff --git a/dev-ruby/ncurses-ruby/Manifest b/dev-ruby/ncurses-ruby/Manifest
index ae181b48b332..7a0d287625df 100644
--- a/dev-ruby/ncurses-ruby/Manifest
+++ b/dev-ruby/ncurses-ruby/Manifest
@@ -1,4 +1,4 @@
MD5 45fb241e390831e9ce07ccff84be6541 ChangeLog 643
MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 d03c25f6b05ea91ecf90254b8e6e9018 ncurses-ruby-0.8.ebuild 567
+MD5 8f3ac6c4be5afcaa0efb9645bd0357a4 ncurses-ruby-0.8.ebuild 573
MD5 c45b544e8fd90d6a8baad8d12bc7efa6 files/digest-ncurses-ruby-0.8 68
diff --git a/dev-ruby/ncurses-ruby/ncurses-ruby-0.8.ebuild b/dev-ruby/ncurses-ruby/ncurses-ruby-0.8.ebuild
index ddef71a3d10b..3d094aed3733 100644
--- a/dev-ruby/ncurses-ruby/ncurses-ruby-0.8.ebuild
+++ b/dev-ruby/ncurses-ruby/ncurses-ruby-0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ncurses-ruby/ncurses-ruby-0.8.ebuild,v 1.4 2003/11/15 17:48:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ncurses-ruby/ncurses-ruby-0.8.ebuild,v 1.5 2003/11/16 19:27:24 usata Exp $
inherit ruby
@@ -9,7 +9,7 @@ HOMEPAGE="http://ncurses-ruby.berlios.de/"
SRC_URI="http://download.berlios.de/ncurses-ruby/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-USE_RUBY="1.6 1.8"
+USE_RUBY="ruby16 ruby18"
KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc x86"
IUSE=""
DEPEND=">=dev-lang/ruby-1.6
diff --git a/dev-ruby/ruby-eb/Manifest b/dev-ruby/ruby-eb/Manifest
index 1229133a72e0..2c6ee6dffe93 100644
--- a/dev-ruby/ruby-eb/Manifest
+++ b/dev-ruby/ruby-eb/Manifest
@@ -1,4 +1,4 @@
-MD5 b9527409ed88783916a9f64e374be90b ruby-eb-2.3.ebuild 540
+MD5 c9643478e221d3bce043de721437b483 ruby-eb-2.3.ebuild 546
MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
MD5 2b2ba49d1d1c7089a1bbd9275a9f610d ChangeLog 328
MD5 a13eba1e5538641f99000a564e9becfe files/digest-ruby-eb-2.3 61
diff --git a/dev-ruby/ruby-eb/ruby-eb-2.3.ebuild b/dev-ruby/ruby-eb/ruby-eb-2.3.ebuild
index 7b412d788263..9ed948cada1b 100644
--- a/dev-ruby/ruby-eb/ruby-eb-2.3.ebuild
+++ b/dev-ruby/ruby-eb/ruby-eb-2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-eb/ruby-eb-2.3.ebuild,v 1.3 2003/11/15 17:48:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-eb/ruby-eb-2.3.ebuild,v 1.4 2003/11/16 19:27:24 usata Exp $
inherit ruby
@@ -14,7 +14,7 @@ SRC_URI="http://rubyeb.sourceforge.net/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-USE_RUBY="1.6 1.8"
+USE_RUBY="ruby16 ruby18"
KEYWORDS="~x86"
DEPEND="sys-libs/zlib
diff --git a/dev-ruby/ruby-mmap/Manifest b/dev-ruby/ruby-mmap/Manifest
index 4f1b4a3c55c3..92d5b9043a2f 100644
--- a/dev-ruby/ruby-mmap/Manifest
+++ b/dev-ruby/ruby-mmap/Manifest
@@ -1,4 +1,4 @@
-MD5 1fb20f90a3f33c3861a50a9ac6090aec ruby-mmap-0.2.2.ebuild 617
+MD5 609182fad48ce1b02d1ec0c0819a4600 ruby-mmap-0.2.2.ebuild 623
MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
MD5 e1c3f88fc4e2c6aac1be970eb653be1a ChangeLog 509
MD5 deeb1bf07e6cfba67aff696232a7cfd5 files/digest-ruby-mmap-0.2.2 61
diff --git a/dev-ruby/ruby-mmap/ruby-mmap-0.2.2.ebuild b/dev-ruby/ruby-mmap/ruby-mmap-0.2.2.ebuild
index 97bad9459ac1..7423eac99304 100644
--- a/dev-ruby/ruby-mmap/ruby-mmap-0.2.2.ebuild
+++ b/dev-ruby/ruby-mmap/ruby-mmap-0.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ruby-mmap-0.2.2.ebuild,v 1.4 2003/11/15 17:48:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-mmap/ruby-mmap-0.2.2.ebuild,v 1.5 2003/11/16 19:27:24 usata Exp $
inherit ruby
@@ -13,7 +13,7 @@ HOMEPAGE="http://moulon.inra.fr/ruby/mmap.html"
SRC_URI="ftp://moulon.inra.fr/pub/ruby/${MY_P}.tar.gz"
SLOT="0"
-USE_RUBY="1.6 1.8"
+USE_RUBY="ruby16 ruby18"
LICENSE="Ruby"
KEYWORDS="x86 alpha ppc sparc"
diff --git a/dev-ruby/ruby-tcpwrap/Manifest b/dev-ruby/ruby-tcpwrap/Manifest
index c5f88e4ab999..a9fa6ecfe929 100644
--- a/dev-ruby/ruby-tcpwrap/Manifest
+++ b/dev-ruby/ruby-tcpwrap/Manifest
@@ -1,6 +1,6 @@
MD5 f691e75cce5ffe841a9ff0d073bc31fe ChangeLog 682
MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
MD5 03af7df61ccb70207090d5eadded6601 ruby-tcpwrap-0.5.ebuild 709
-MD5 5247bbea6ddf888f125ed2933d98257c ruby-tcpwrap-0.6.ebuild 695
+MD5 d487982d4588305d26ba30ca3c89b4c1 ruby-tcpwrap-0.6.ebuild 701
MD5 a82c7f3f05166f1f662746bf4882646f files/digest-ruby-tcpwrap-0.5 66
MD5 8dfa8390946d6b5318bba0928992a2b0 files/digest-ruby-tcpwrap-0.6 66
diff --git a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6.ebuild b/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6.ebuild
index 3f2a7d9f889f..655596fc017a 100644
--- a/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6.ebuild
+++ b/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6.ebuild,v 1.3 2003/11/15 17:48:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-tcpwrap/ruby-tcpwrap-0.6.ebuild,v 1.4 2003/11/16 19:27:24 usata Exp $
inherit ruby
@@ -12,7 +12,7 @@ SRC_URI="http://shugo.net/archive/ruby-tcpwrap/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-USE_RUBY="1.6 1.8"
+USE_RUBY="ruby16 ruby18"
KEYWORDS="alpha ~arm ~hppa ~mips ~sparc x86"
DEPEND="dev-lang/ruby
diff --git a/dev-ruby/ruby-zlib/Manifest b/dev-ruby/ruby-zlib/Manifest
index baad49ab1d6d..2a04e2747f96 100644
--- a/dev-ruby/ruby-zlib/Manifest
+++ b/dev-ruby/ruby-zlib/Manifest
@@ -1,4 +1,4 @@
-MD5 72c146b416806ffd49d60e8aa4d5c786 ruby-zlib-0.6.0.ebuild 521
+MD5 921696c54ff44faddbc9bdbad0acbead ruby-zlib-0.6.0.ebuild 527
MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
MD5 0333e5b9ab6de34dab6ad64103ed9990 ChangeLog 458
MD5 70223a78f1d17200eeab31b8dec45658 files/digest-ruby-zlib-0.6.0 66
diff --git a/dev-ruby/ruby-zlib/ruby-zlib-0.6.0.ebuild b/dev-ruby/ruby-zlib/ruby-zlib-0.6.0.ebuild
index 408b573b858e..32dcbe0fcefa 100644
--- a/dev-ruby/ruby-zlib/ruby-zlib-0.6.0.ebuild
+++ b/dev-ruby/ruby-zlib/ruby-zlib-0.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-zlib/ruby-zlib-0.6.0.ebuild,v 1.4 2003/11/15 17:48:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-zlib/ruby-zlib-0.6.0.ebuild,v 1.5 2003/11/16 19:27:24 usata Exp $
inherit ruby
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.blue.sky.or.jp/atelier/ruby/"
SRC_URI="http://www.blue.sky.or.jp/atelier/ruby/${P}.tar.gz"
SLOT="0"
-USE_RUBY="1.6 1.8"
+USE_RUBY="ruby16 ruby18"
LICENSE="Ruby"
KEYWORDS="x86 alpha ~ppc sparc"
diff --git a/dev-ruby/sary-ruby/Manifest b/dev-ruby/sary-ruby/Manifest
index b674195bfd83..745309ab0ff3 100644
--- a/dev-ruby/sary-ruby/Manifest
+++ b/dev-ruby/sary-ruby/Manifest
@@ -1,4 +1,4 @@
MD5 e5c9f896d0f29ffd4c705f0f40771bd6 metadata.xml 248
-MD5 f0ba5fffa10f2a45bb74110d3a6dc399 sary-ruby-0.5_pre20030507.ebuild 628
+MD5 576e07e180f8a7d4506b918aa55422df sary-ruby-0.5_pre20030507.ebuild 634
MD5 35b782ee20d5a5bdf34f1824b5ccfc29 ChangeLog 435
MD5 d11432395695c3eca31fdd06e32074ae files/digest-sary-ruby-0.5_pre20030507 73
diff --git a/dev-ruby/sary-ruby/sary-ruby-0.5_pre20030507.ebuild b/dev-ruby/sary-ruby/sary-ruby-0.5_pre20030507.ebuild
index 479e00d7c34d..68089e766b9d 100644
--- a/dev-ruby/sary-ruby/sary-ruby-0.5_pre20030507.ebuild
+++ b/dev-ruby/sary-ruby/sary-ruby-0.5_pre20030507.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/sary-ruby-0.5_pre20030507.ebuild,v 1.3 2003/11/15 17:48:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sary-ruby/sary-ruby-0.5_pre20030507.ebuild,v 1.4 2003/11/16 19:27:24 usata Exp $
inherit ruby
@@ -17,7 +17,7 @@ SRC_URI="http://taiyaki.org/tmp/sary/${MY_PN}_${PV/*_pre/}.tar.gz"
LICENSE="LGPL-2.1"
KEYWORDS="~x86"
SLOT="0"
-USE_RUBY="1.6 1.8"
+USE_RUBY="ruby16 ruby18"
S="${WORKDIR}/${PN}"
DEPEND=">=app-text/sary-1.0.3"
diff --git a/eclass/ruby.eclass b/eclass/ruby.eclass
index 9f0537b9167e..3c2985079024 100644
--- a/eclass/ruby.eclass
+++ b/eclass/ruby.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.14 2003/11/15 21:25:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.15 2003/11/16 19:27:24 usata Exp $
#
# Author: Mamoru KOMACHI <usata@gentoo.org>
#
@@ -13,11 +13,16 @@
# econf, emake and einstall defined by ebuild.sh respectively).
# Variables:
-# USE_RUBY Defines which version of ruby is supported.
-# Set it to "0" if it installs only version independent files,
-# and set it to something like "1.6 1.8" if the ebuild supports
-# both ruby 1.6 and 1.8 but has version depenedent files such
-# as libraries.
+# USE_RUBY Space delimited list of supported ruby.
+# Set it to "any" if it installs only version independent files.
+# If your ebuild supports both ruby 1.6 and 1.8 but has version
+# depenedent files such as libraries, set it to something like
+# "ruby16 ruby18". Possible values are "any ruby16 shim18 ruby18"
+# Note: USE_RUBY="shim18" doesn't take any effect at the moment.
+# WITH_RUBY Contains space delimited list of installed ruby which is
+# supported (supported ruby should be specified in USE_RUBY).
+# It is automatically defined if your ebuild set DEPEND list
+# correctly, so usually you shouldn't set this variable by hand.
# EXTRA_ECONF You can pass extra arguments to econf by defining this
# variable. Note that you cannot specify them by command line
# if you are using <sys-apps/portage-2.0.49-r17.
@@ -34,19 +39,19 @@ SLOT="0"
LICENSE="Ruby"
newdepend ">=dev-lang/ruby-1.6.8"
-if has_version '=dev-lang/ruby-1.6*' && [[ "${USE_RUBY/1.6/}" != "${USE_RUBY}" ]] ; then
- WITH_RUBY="${WITH_RUBY} 1.6"
+if has_version '=dev-lang/ruby-1.6*' && [[ "${USE_RUBY/ruby16/}" != "${USE_RUBY}" ]] ; then
+ WITH_RUBY="${WITH_RUBY} ruby16"
fi
-if has_version '=dev-lang/ruby-1.8*' && [[ "${USE_RUBY/1.8/}" != "${USE_RUBY}" ]] ; then
- WITH_RUBY="${WITH_RUBY} 1.8"
+if has_version '=dev-lang/ruby-1.8*' && [[ "${USE_RUBY/ruby18/}" != "${USE_RUBY}" ]] ; then
+ WITH_RUBY="${WITH_RUBY} ruby18"
fi
if has_version '=dev-lang/ruby-1.6*' && has_version '=dev-lang/ruby-1.8*' \
- [[ "${USE_RUBY/0/}" != "${USE_RUBY}" ]] ; then
- WITH_RUBY="0"
+ && [[ "${USE_RUBY/any/}" != "${USE_RUBY}" ]] ; then
+ WITH_RUBY="${WITH_RUBY} any"
fi
ruby_src_unpack() {
- if [[ "${WITH_RUBY/1.6/}" != "${WITH_RUBY}" && "${WITH_RUBY/1.8/}" != "${WITH_RUBY}" ]] ; then
+ if [[ "${WITH_RUBY/ruby16/}" != "${WITH_RUBY}" && "${WITH_RUBY/ruby18/}" != "${WITH_RUBY}" ]] ; then
mkdir -p ${S}/{1.6,1.8}
cd ${S}/1.6; unpack ${A}; cd -
cd ${S}/1.8; unpack ${A}; cd -
@@ -91,7 +96,7 @@ erubyconf() {
}
ruby_econf() {
- if [[ "${WITH_RUBY/1.6/}" != "${WITH_RUBY}" && "${WITH_RUBY/1.8/}" != "${WITH_RUBY}" ]] ; then
+ if [[ "${WITH_RUBY/ruby16/}" != "${WITH_RUBY}" && "${WITH_RUBY/ruby18/}" != "${WITH_RUBY}" ]] ; then
einfo "running econf for ruby 1.6 ;)"
cd 1.6/${S#${WORKDIR}}
erubyconf ruby16 $@ || die
@@ -100,6 +105,12 @@ ruby_econf() {
cd 1.8/${S#${WORKDIR}}
erubyconf ruby18 $@ || die
cd -
+ elif [[ "${WITH_RUBY/ruby16/}" != "${WITH_RUBY}" ]] ; then
+ einfo "running econf for ruby 1.6 ;)"
+ erubyconf ruby16 $@ || die
+ elif [[ "${WITH_RUBY/ruby18/}" != "${WITH_RUBY}" ]] ; then
+ einfo "running econf for ruby 1.8 ;)"
+ erubyconf ruby18 $@ || die
else
einfo "running econf for ruby ;)"
erubyconf ruby $@ || die
@@ -113,7 +124,7 @@ erubymake() {
}
ruby_emake() {
- if [[ "${WITH_RUBY/1.6/}" != "${WITH_RUBY}" && "${WITH_RUBY/1.8/}" != "${WITH_RUBY}" ]] ; then
+ if [[ "${WITH_RUBY/ruby16/}" != "${WITH_RUBY}" && "${WITH_RUBY/ruby18/}" != "${WITH_RUBY}" ]] ; then
einfo "running emake for ruby 1.6 ;)"
cd 1.6/${S#${WORKDIR}}
erubymake $@ || die
@@ -122,6 +133,14 @@ ruby_emake() {
cd 1.8/${S#${WORKDIR}}
erubymake $@ || die
cd -
+ elif [[ "${WITH_RUBY/ruby16/}" != "${WITH_RUBY}" ]] ; then
+ einfo "running emake for ruby 1.6 ;)"
+ [[ -x /usr/bin/ruby16 ]] && alias ruby ruby16
+ erubymake $@
+ elif [[ "${WITH_RUBY/ruby18/}" != "${WITH_RUBY}" ]] ; then
+ einfo "running emake for ruby 1.8 ;)"
+ [[ -x /usr/bin/ruby18 ]] && alias ruby ruby18
+ erubymake $@
else
einfo "running emake for ruby ;)"
erubymake $@ || die
@@ -153,7 +172,7 @@ erubyinstall() {
elif [ -f extconf.rb -o -f Makefile ] ; then
make DESTDIR=${D} $@ install || die "make install failed"
else
- if [[ "${WITH_RUBY/1.6/}" != "${WITH_RUBY}" && "${WITH_RUBY/1.8/}" != "${WITH_RUBY}" ]] ; then
+ if [[ "${WITH_RUBY/ruby16/}" != "${WITH_RUBY}" && "${WITH_RUBY/ruby18/}" != "${WITH_RUBY}" ]] ; then
siteruby=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')
else
siteruby=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitedir"]')
@@ -167,7 +186,7 @@ ruby_einstall() {
local siteruby=$(ruby -r rbconfig -e 'print Config::CONFIG["sitelibdir"]')
- if [[ "${WITH_RUBY/1.6/}" != "${WITH_RUBY}" && "${WITH_RUBY/1.8/}" != "${WITH_RUBY}" ]] ; then
+ if [[ "${WITH_RUBY/ruby16/}" != "${WITH_RUBY}" && "${WITH_RUBY/ruby18/}" != "${WITH_RUBY}" ]] ; then
einfo "running einstall for ruby 1.6 ;)"
MY_S=${S}/1.6/${S#${WORKDIR}}
cd ${MY_S}
@@ -178,7 +197,13 @@ ruby_einstall() {
erubyinstall ruby18 $@
S=${MY_S}
#cd -
- elif [[ "${WITH_RUBY/0/}" != "${WITH_RUBY}" ]] ; then
+ elif [[ "${WITH_RUBY/ruby16/}" != "${WITH_RUBY}" ]] ; then
+ einfo "running einstall for ruby 1.6 ;)"
+ erubyinstall ruby16 $@
+ elif [[ "${WITH_RUBY/ruby18/}" != "${WITH_RUBY}" ]] ; then
+ einfo "running einstall for ruby 1.8 ;)"
+ erubyinstall ruby18 $@
+ elif [[ "${WITH_RUBY/any/}" != "${WITH_RUBY}" ]] ; then
if [ -n "`use ruby18`" ] ; then
erubyinstall ruby18 $@
if [ -d ${D}${siteruby}/../1.8 ] ; then