Fix use invocation and has_version mis-usage

5 files changed, 28 insertions, 31 deletions

diff --git a/dev-ruby/mod-ruby/ChangeLog b/dev-ruby/mod-ruby/ChangeLog
index d7da155e5e53..414464f9eee9 100644
--- a/dev-ruby/mod-ruby/ChangeLog
+++ b/dev-ruby/mod-ruby/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/mod-ruby
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.13 2004/05/22 11:21:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/ChangeLog,v 1.14 2004/06/08 21:41:47 agriffis Exp $
+
+  08 Jun 2004; Aron Griffis <agriffis@gentoo.org> mod-ruby-1.0.7.ebuild,
+  mod-ruby-1.1.3-r1.ebuild, mod-ruby-1.2.0.ebuild:
+  Fix use invocation and has_version mis-usage
 
 *mod-ruby-1.2.0 (22 May 2004)
 
diff --git a/dev-ruby/mod-ruby/Manifest b/dev-ruby/mod-ruby/Manifest
index 1ae80bbcc7ca..df01c21bd7ea 100644
--- a/dev-ruby/mod-ruby/Manifest
+++ b/dev-ruby/mod-ruby/Manifest
@@ -1,10 +1,10 @@
-MD5 c7f38da7d36c6482c86de4ce5157bfbf mod-ruby-1.2.0.ebuild 2065
-MD5 0e4d62151713992f70db3a45d244377c mod-ruby-1.1.3-r1.ebuild 2012
-MD5 e11bcee32d6165e1b7657171b7108077 mod-ruby-1.0.7.ebuild 870
-MD5 017aff8f0282b215bf71edbc78f6294d ChangeLog 2621
+MD5 64638f74a2c4855dab0251900c2dc5fd ChangeLog 2795
+MD5 72a76541e53727a8298756d5021e446e mod-ruby-1.2.0.ebuild 2002
+MD5 b26fb5df4f45d29577bfb18c0956db21 mod-ruby-1.0.7.ebuild 976
+MD5 86fa4c63dce493c96e0e9ac025d350c5 mod-ruby-1.1.3-r1.ebuild 1949
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 fa5123111f5278201525d49f658b4a3b files/digest-mod-ruby-1.0.7 65
+MD5 9212f9bc81514ddee76f6c4251ca71c3 files/20_mod_ruby.conf 1286
 MD5 0a74830d798b9c7060bbba167eda608d files/digest-mod-ruby-1.2.0 65
+MD5 fa5123111f5278201525d49f658b4a3b files/digest-mod-ruby-1.0.7 65
 MD5 70674a49abbe9321ac65cf4932c0ad23 files/mod_ruby.conf 846
 MD5 808f10c468d40bfb56996efe8f5eafb9 files/digest-mod-ruby-1.1.3-r1 65
-MD5 9212f9bc81514ddee76f6c4251ca71c3 files/20_mod_ruby.conf 1286
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild
index e77872afee7e..6bf80fb146b6 100644
--- a/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild
+++ b/dev-ruby/mod-ruby/mod-ruby-1.0.7.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/mod-ruby/mod-ruby-1.0.7.ebuild,v 1.3 2004/05/22 11:21:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-1.0.7.ebuild,v 1.4 2004/06/08 21:41:47 agriffis Exp $
 
 DESCRIPTION="An Apache2 DSO providing an embedded Ruby interpreter"
 HOMEPAGE="http://www.modruby.net/"
@@ -15,15 +15,16 @@ IUSE=""
 SLOT="0"
 
 src_compile() {
-	./configure.rb --with-apxs=/usr/sbin/apxs2 || die
-	sed -i -e 's|usr/lib/apache2/modules|usr/lib/apache2-extramodules|' Makefile
-	emake || die
+	./configure.rb --with-apxs=/usr/sbin/apxs2 || die "configure.rb failed"
+	sed -i -e 's|usr/lib/apache2/modules|usr/lib/apache2-extramodules|' Makefile \
+		|| die "sed failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 	insinto /etc/apache2/conf/modules.d
-	doins ${FILESDIR}/20_mod_ruby.conf
-	dodoc ${FILESDIR}/20_mod_ruby.conf
-	dodoc ChangeLog COPYING README*
+	doins ${FILESDIR}/20_mod_ruby.conf || die
+	dodoc ${FILESDIR}/20_mod_ruby.conf || die
+	dodoc ChangeLog COPYING README* || die
 }
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.1.3-r1.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.1.3-r1.ebuild
index dd646c74e2e2..02b6c6b23731 100644
--- a/dev-ruby/mod-ruby/mod-ruby-1.1.3-r1.ebuild
+++ b/dev-ruby/mod-ruby/mod-ruby-1.1.3-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-ruby/mod-ruby/mod-ruby-1.1.3-r1.ebuild,v 1.2 2004/05/22 11:21:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-1.1.3-r1.ebuild,v 1.3 2004/06/08 21:41:47 agriffis Exp $
 
 MY_P=mod_ruby-${PV}
 DESCRIPTION="Embeds the Ruby interpreter into Apache"
@@ -16,11 +16,7 @@ DEPEND=">=net-www/apache-1.3.3
 S=${WORKDIR}/${MY_P}
 
 apache2-detect() {
-	if [ "`has_version '=net-www/apache-1*'`" != 1 -o "`use apache2`" ]; then
-		true
-	else
-		false
-	fi
+	use apache2 || ! has_version '=net-www/apache-1*'
 }
 
 src_compile() {
@@ -39,7 +35,7 @@ src_compile() {
 
 	emake || die
 
-	if [ "`use doc`" ]; then
+	if use doc; then
 		cd doc
 		emake
 	fi
@@ -59,7 +55,7 @@ src_install() {
 
 	dodoc ChangeLog COPYING README.*
 
-	if [ "`use doc`" ]; then
+	if use doc; then
 		dohtml doc/*.css doc/*.html
 	fi
 
diff --git a/dev-ruby/mod-ruby/mod-ruby-1.2.0.ebuild b/dev-ruby/mod-ruby/mod-ruby-1.2.0.ebuild
index 904c71e68d49..9f4a4849523b 100644
--- a/dev-ruby/mod-ruby/mod-ruby-1.2.0.ebuild
+++ b/dev-ruby/mod-ruby/mod-ruby-1.2.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-ruby/mod-ruby/mod-ruby-1.2.0.ebuild,v 1.1 2004/05/22 11:21:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod-ruby/mod-ruby-1.2.0.ebuild,v 1.2 2004/06/08 21:41:47 agriffis Exp $
 
 MY_P=mod_ruby-${PV}
 DESCRIPTION="Embeds the Ruby interpreter into Apache"
@@ -17,11 +17,7 @@ DEPEND=">=net-www/apache-1.3.3
 S=${WORKDIR}/${MY_P}
 
 apache2-detect() {
-	if [ "`has_version '=net-www/apache-1*'`" != 1 -o "`use apache2`" ]; then
-		true
-	else
-		false
-	fi
+	use apache2 || ! has_version '=net-www/apache-1*'
 }
 
 src_compile() {
@@ -40,7 +36,7 @@ src_compile() {
 
 	emake || die
 
-	if [ "`use doc`" ]; then
+	if use doc; then
 		cd doc
 		emake
 	fi
@@ -60,7 +56,7 @@ src_install() {
 
 	dodoc ChangeLog COPYING README.*
 
-	if [ "`use doc`" ]; then
+	if use doc; then
 		dohtml doc/*.css doc/*.html
 	fi