Fixed typo in updating ruby's symlinks

5 files changed, 21 insertions, 16 deletions

diff --git a/dev-lang/ruby-cvs/ChangeLog b/dev-lang/ruby-cvs/ChangeLog
index 5d3a03becf00..3f1ae2fbf54b 100644
--- a/dev-lang/ruby-cvs/ChangeLog
+++ b/dev-lang/ruby-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/ruby-cvs
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ChangeLog,v 1.9 2004/01/30 08:10:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ChangeLog,v 1.10 2004/02/21 10:39:51 usata Exp $
+
+  21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ruby-cvs-1.8.1-r1.ebuild,
+  ruby-cvs-1.9.0-r1.ebuild:
+  Fixed typo in updating ruby's symlinks. Removed ~mips and ~arm
+  KEYWORD because of broken DEPEND.
 
 *ruby-cvs-1.8.1-r1 (30 Jan 2004)
 
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild
index 983a89c11ed7..1c107dfc7dc4 100644
--- a/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.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-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild,v 1.1 2004/01/30 08:10:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ruby-cvs-1.8.1-r1.ebuild,v 1.2 2004/02/21 10:39:51 usata Exp $
 
 IUSE="socks5 tcltk"
 
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~hppa ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
@@ -78,7 +78,7 @@ src_install() {
 
 pkg_postinst() {
 
-	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+	if [ ! -n "$(readlink /usr/bin/ruby)" ] ; then
 		/usr/sbin/ruby-config ruby${SLOT/./}
 	fi
 	einfo
@@ -88,7 +88,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 
-	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+	if [ ! -n "$(readlink /usr/bin/ruby)" ] ; then
 		/usr/sbin/ruby-config ruby${SLOT/./}
 	fi
 }
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild
index b7462cf1d8dc..4de8cf99e154 100644
--- a/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.8.1.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-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild,v 1.1 2004/01/25 12:10:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ruby-cvs-1.8.1.ebuild,v 1.2 2004/02/21 10:39:51 usata Exp $
 
 IUSE="socks5 tcltk"
 
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE="Ruby"
 SLOT="1.8"
-KEYWORDS="~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~hppa ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild
index dcd898383d78..7cac2c27c9f4 100644
--- a/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.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-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild,v 1.1 2004/01/30 08:10:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ruby-cvs-1.9.0-r1.ebuild,v 1.2 2004/02/21 10:39:51 usata Exp $
 
 IUSE="socks5 tcltk"
 
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE="Ruby"
 SLOT="1.9"
-KEYWORDS="~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~hppa ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
@@ -63,13 +63,13 @@ src_compile() {
 		`use_enable socks5 socks` \
 		--disable-install-doc \
 		|| die "econf failed"
-	emake || die "emake failed"
+	emake || emake || die "emake failed"
 }
 
 src_install() {
 	#export RUBY=${D}/usr/bin/ruby19
-	export LD_LIBRARY_PATH=${D}/usr/lib RUBYLIB=${D}/usr/lib/ruby/1.9
-	einstall DESTDIR=${D} || die "einstall failed"
+	export LD_LIBRARY_PATH=${D}/usr/lib RUBYLIB=${D}/usr/lib/ruby/${SLOT}
+	make DESTDIR=${D} install || die "make install failed"
 
 	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV%.*}
 	dosym /usr/lib/libruby${SLOT/./}.so.${PV} /usr/lib/libruby.so.${PV}
@@ -79,7 +79,7 @@ src_install() {
 
 pkg_postinst() {
 
-	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+	if [ ! -n "$(readlink /usr/bin/ruby)" ] ; then
 		/usr/sbin/ruby-config ruby${SLOT/./}
 	fi
 	einfo
@@ -89,7 +89,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 
-	if [ ! -e "$(readlink /usr/bin/ruby)" ] ; then
+	if [ ! -n "$(readlink /usr/bin/ruby)" ] ; then
 		/usr/sbin/ruby-config ruby${SLOT/./}
 	fi
 }
diff --git a/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild b/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild
index 35b342321a0c..14c42594e70d 100644
--- a/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild
+++ b/dev-lang/ruby-cvs/ruby-cvs-1.9.0.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-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild,v 1.1 2004/01/25 12:10:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby-cvs/ruby-cvs-1.9.0.ebuild,v 1.2 2004/02/21 10:39:51 usata Exp $
 
 IUSE="socks5 tcltk"
 
@@ -13,7 +13,7 @@ SRC_URI=""
 
 LICENSE="Ruby"
 SLOT="1.9"
-KEYWORDS="~alpha ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~hppa ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0