diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2003-11-15 21:25:51 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2003-11-15 21:25:51 +0000 |
| commit | bedf86397ec4e38d49b164fa2ae9823d77fa3d6d (patch) | |
| tree | b28627a9d88c8ef48a86a16bc1962126ff99805c /eclass | |
| parent | First release of an cvs-snapshot version for gomd, the general openMosix (diff) | |
| download | gentoo-2-bedf86397ec4e38d49b164fa2ae9823d77fa3d6d.tar.gz gentoo-2-bedf86397ec4e38d49b164fa2ae9823d77fa3d6d.tar.bz2 gentoo-2-bedf86397ec4e38d49b164fa2ae9823d77fa3d6d.zip | |
Fixed symlinks with USE_RUBY="0" when only one version of ruby is installed
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ruby.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/ruby.eclass b/eclass/ruby.eclass index d288157abadd..9f0537b9167e 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.13 2003/11/15 21:12:23 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.14 2003/11/15 21:25:51 usata Exp $ # # Author: Mamoru KOMACHI <usata@gentoo.org> # @@ -40,6 +40,10 @@ fi if has_version '=dev-lang/ruby-1.8*' && [[ "${USE_RUBY/1.8/}" != "${USE_RUBY}" ]] ; then WITH_RUBY="${WITH_RUBY} 1.8" 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" +fi ruby_src_unpack() { if [[ "${WITH_RUBY/1.6/}" != "${WITH_RUBY}" && "${WITH_RUBY/1.8/}" != "${WITH_RUBY}" ]] ; then @@ -174,7 +178,7 @@ ruby_einstall() { erubyinstall ruby18 $@ S=${MY_S} #cd - - elif [[ "${USE_RUBY/0/}" != "${USE_RUBY}" ]] ; then + elif [[ "${WITH_RUBY/0/}" != "${WITH_RUBY}" ]] ; then if [ -n "`use ruby18`" ] ; then erubyinstall ruby18 $@ if [ -d ${D}${siteruby}/../1.8 ] ; then |