A=-fix, try->die, tab-fixes, stylefixes, ...

5 files changed, 42 insertions, 53 deletions

diff --git a/dev-ruby/amstd/amstd-1.9.5.ebuild b/dev-ruby/amstd/amstd-1.9.5.ebuild
index 3b6949d7cd5e..347a04ade4a0 100644
--- a/dev-ruby/amstd/amstd-1.9.5.ebuild
+++ b/dev-ruby/amstd/amstd-1.9.5.ebuild
@@ -1,25 +1,23 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amstd/amstd-1.9.5.ebuild,v 1.2 2001/01/16 17:13:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amstd/amstd-1.9.5.ebuild,v 1.3 2001/11/10 12:17:54 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard libraries for Ruby"
-SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${A}"
+SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${P}.tar.gz"
 HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
 
 DEPEND=">=dev-lang/ruby-1.6.1"
 
 src_compile() {
-    cd ${S}
-    try ruby setup.rb config
-    try ruby setup.rb setup
+	ruby setup.rb config || die
+	ruby setup.rb setup || die
 }
 
 src_install () {
-    cd ${S}
-    try ruby setup.rb install --bin-dir=${D}/usr/bin \
-        --rb-dir=${D}/usr/lib/ruby/site_ruby/1.6 \
-        --so-dir=${D}/usr/lib/ruby/site_ruby/1.6/${CHOST%%-*}-linux-gnu
+	ruby setup.rb install --bin-dir=${D}/usr/bin 			\
+	     --rb-dir=${D}/usr/lib/ruby/site_ruby/1.6 			\
+	     --so-dir=${D}/usr/lib/ruby/site_ruby/1.6/${CHOST%%-*}-linux-gnu
+	assert
 }
diff --git a/dev-ruby/optparse/optparse-0.7.5.ebuild b/dev-ruby/optparse/optparse-0.7.5.ebuild
index 345c8ae45073..630142db5ecb 100644
--- a/dev-ruby/optparse/optparse-0.7.5.ebuild
+++ b/dev-ruby/optparse/optparse-0.7.5.ebuild
@@ -1,27 +1,24 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/optparse/optparse-0.7.5.ebuild,v 1.1 2000/11/17 08:22:04 jerry Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/optparse/optparse-0.7.5.ebuild,v 1.2 2001/11/10 12:17:54 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Yet another option parser for Ruby"
-SRC_URI=" http://member.nifty.ne.jp/nokada/archive/${A}"
+SRC_URI=" http://member.nifty.ne.jp/nokada/archive/${P}.tar.gz"
 HOMEPAGE=" http://member.nifty.ne.jp/nokada/ruby.html"
 
 DEPEND=">=dev-lang/ruby-1.6.1"
 
 #src_compile() {
-#    cd ${S}
-#    try ruby setup.rb config --without=amstd
-#    try ruby setup.rb setup
+#    ruby setup.rb config --without=amstd || die
+#    ruby setup.rb setup || die
 #}
 
 src_install () {
-    cd ${S}
-    insinto /usr/lib/ruby/site_ruby/1.6
-    doins optparse.rb
+	insinto /usr/lib/ruby/site_ruby/1.6
+	doins optparse.rb
 
-    insinto /usr/lib/ruby/site_ruby/1.6/optparse
-    doins optparse/*
+	insinto /usr/lib/ruby/site_ruby/1.6/optparse
+	doins optparse/*
 }
diff --git a/dev-ruby/racc/racc-1.2.4.ebuild b/dev-ruby/racc/racc-1.2.4.ebuild
index bfa0080c3177..9967e598a19c 100644
--- a/dev-ruby/racc/racc-1.2.4.ebuild
+++ b/dev-ruby/racc/racc-1.2.4.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.2.4.ebuild,v 1.2 2001/01/16 17:13:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/racc/racc-1.2.4.ebuild,v 1.3 2001/11/10 12:17:54 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="LALR parser generator for Ruby"
-SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${A}"
+SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${P}.tar.gz"
 HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
 
 DEPEND=">=dev-lang/ruby-1.6.1
         >=dev-ruby/amstd-1.9.5"
 
 src_compile() {
-    cd ${S}
-    try ruby setup.rb config --without=amstd
-    try ruby setup.rb setup
+	ruby setup.rb config --without=amstd || die
+	ruby setup.rb setup || die
 }
 
 src_install () {
-    cd ${S}
-    try ruby setup.rb install --bin-dir=${D}/usr/bin \
-        --rb-dir=${D}/usr/lib/ruby/site_ruby/1.6 \
-        --so-dir=${D}/usr/lib/ruby/site_ruby/1.6/${CHOST%%-*}-linux-gnu
+	ruby setup.rb install 						\
+	     --bin-dir=${D}/usr/bin 					\
+	     --rb-dir=${D}/usr/lib/ruby/site_ruby/1.6 			\
+	     --so-dir=${D}/usr/lib/ruby/site_ruby/1.6/${CHOST%%-*}-linux-gnu
+	assert
 }
diff --git a/dev-ruby/rdtool/rdtool-0.6.6.ebuild b/dev-ruby/rdtool/rdtool-0.6.6.ebuild
index 1ff00901a518..c22c821ef9ba 100644
--- a/dev-ruby/rdtool/rdtool-0.6.6.ebuild
+++ b/dev-ruby/rdtool/rdtool-0.6.6.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.6.ebuild,v 1.1 2000/11/17 08:22:04 jerry Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdtool/rdtool-0.6.6.ebuild,v 1.2 2001/11/10 12:17:54 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Fast string scanning library for Ruby"
-SRC_URI="http://www2.pos.to/~tosh/ruby/rdtool/archive/${A}"
+SRC_URI="http://www2.pos.to/~tosh/ruby/rdtool/archive/${P}.tar.gz"
 HOMEPAGE="http://www2.pos.to/~tosh/ruby/rdtool/en/index.html"
 
 DEPEND=">=dev-lang/ruby-1.6.1
@@ -15,17 +14,15 @@ DEPEND=">=dev-lang/ruby-1.6.1
         >=dev-ruby/optparse-0.7.5"
 
 src_compile() {
-    cd ${S}
-    try ruby rdtoolconf.rb
-    try make
+	ruby rdtoolconf.rb || die
+	make || die
 }
 
 src_install () {
-    cd ${S}
-    chmod 755 rd2
-    dobin rd2
+	chmod 755 rd2
+	dobin rd2
 
-    cd ${S}/rd
-    insinto /usr/lib/ruby/site_ruby/1.6/rd
-    doins dot.rd2rc *.rb
+	cd ${S}/rd
+	insinto /usr/lib/ruby/site_ruby/1.6/rd
+	doins dot.rd2rc *.rb
 }
diff --git a/dev-ruby/strscan/strscan-0.5.8.ebuild b/dev-ruby/strscan/strscan-0.5.8.ebuild
index 2d25f9bb88a0..b26f7a334bac 100644
--- a/dev-ruby/strscan/strscan-0.5.8.ebuild
+++ b/dev-ruby/strscan/strscan-0.5.8.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/strscan/strscan-0.5.8.ebuild,v 1.2 2001/01/16 17:13:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/strscan/strscan-0.5.8.ebuild,v 1.3 2001/11/10 12:17:54 hallski Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Fast string scanning library for Ruby"
-SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${A}"
+SRC_URI="http://www1.u-netsurf.ne.jp/~brew/mine/soft/${P}.tar.gz"
 HOMEPAGE="http://www1.u-netsurf.ne.jp/~brew/mine/en/index.html"
 
 DEPEND=">=dev-lang/ruby-1.6.1
         >=dev-ruby/amstd-1.9.5"
 
 src_compile() {
-    cd ${S}
-    try ruby setup.rb config --without=amstd
-    try ruby setup.rb setup
+	ruby setup.rb config --without=amstd || die
+	ruby setup.rb setup || die
 }
 
 src_install () {
-    cd ${S}
-    try ruby setup.rb install --bin-dir=${D}/usr/bin \
-        --rb-dir=${D}/usr/lib/ruby/site_ruby/1.6 \
-        --so-dir=${D}/usr/lib/ruby/site_ruby/1.6/${CHOST%%-*}-linux-gnu
+	ruby setup.rb install --bin-dir=${D}/usr/bin 			\
+	     --rb-dir=${D}/usr/lib/ruby/site_ruby/1.6 			\
+	     --so-dir=${D}/usr/lib/ruby/site_ruby/1.6/${CHOST%%-*}-linux-gnu
+	assert
 }