QA: Use die between || and the text; keepdir takes a list and we don't need to dodir before

Package-Manager: portage-2.0.51.22-r1

5 files changed, 67 insertions, 113 deletions

diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index aca088e566ab..f387482af00a 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,9 +1,7 @@
-MD5 efcde21f75e7a0cbc83d4342ff4d5a0a nginx-0.1.36.ebuild 2174
-MD5 ba17b5c0456ed0e8f4ec17e2690fc394 nginx-0.1.35.ebuild 2166
-MD5 cc49db4ce1ccebd1d8a1d02775f46603 nginx-0.1.37.ebuild 2080
-MD5 114f655395217d77dfab2e257cdd9fe4 nginx-0.1.34.ebuild 2073
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 80c9bfec0f6a1a5ac4673d0d06a71ab4 ChangeLog 5749
-MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
 MD5 b4e5149fed4a89f9561a32a8245dd1a7 files/digest-nginx-0.1.34 64
 MD5 ec8d24578f3f015eabf58f8bef4bb939 files/digest-nginx-0.1.35 64
 MD5 776c824b0b5e7e0a0014f1bdbc361409 files/digest-nginx-0.1.36 64
@@ -11,3 +9,15 @@ MD5 23dc869263233b746e0a92df932c1d77 files/digest-nginx-0.1.37 64
 MD5 d8f7e621e098b58848a6b5fb045c49c3 files/nginx 994
 MD5 0dc86e18f344498c4c2e72952637e88e files/nginx-0.1.35-ppc.patch 240
 MD5 fecedd05099122b1f8169152e5bc9462 files/nginx.conf 1400
+MD5 822f3c821527e6a34f23a6a92a884766 metadata.xml 220
+MD5 3b0e6830d37afb9ef770bd009b5e0aa9 nginx-0.1.34.ebuild 1820
+MD5 608e794e594a905ecf1abc1ae492aeef nginx-0.1.35.ebuild 1913
+MD5 93d45b24c7a7e52e0d37a3f2d01d1555 nginx-0.1.36.ebuild 1921
+MD5 abc240d937fafed0f18651714765ff4b nginx-0.1.37.ebuild 1827
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0ZVaI1lqEGTUzyQRAkAGAJ9xVWc9qHbPmENsitGp68oW2X1kYQCggemO
+u/Twa/m3jOqYmTPYFWEDu2Q=
+=BuzV
+-----END PGP SIGNATURE-----
diff --git a/www-servers/nginx/nginx-0.1.34.ebuild b/www-servers/nginx/nginx-0.1.34.ebuild
index a2c841f2dc99..b8fbc775bbf0 100644
--- a/www-servers/nginx/nginx-0.1.34.ebuild
+++ b/www-servers/nginx/nginx-0.1.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.34.ebuild,v 1.2 2005/05/29 14:30:28 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.34.ebuild,v 1.3 2005/07/10 21:38:22 swegener Exp $
 
 inherit eutils
 
@@ -35,37 +35,23 @@ src_compile() {
 	use debug	&& myconf="${myconf} --with-debug"
 	use ssl		&& myconf="${myconf} --with-http_ssl_module"
 
-	cd ${S} && ./configure									\
-		--prefix=/usr										\
-		--conf-path=/etc/${PN}/${PN}.conf					\
-		--http-log-path=/var/log/${PN}/access_log			\
-		--error-log-path=/var/log/${PN}/error_log			\
-		--pid-path=/var/run/${PN}.pid						\
-		--http-client-body-temp-path=/var/tmp/${PN}/client	\
-		--http-proxy-temp-path=/var/tmp/${PN}/proxy			\
-		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi		\
-		--with-md5-asm										\
+	./configure \
+		--prefix=/usr \
+		--conf-path=/etc/${PN}/${PN}.conf \
+		--http-log-path=/var/log/${PN}/access_log \
+		--error-log-path=/var/log/${PN}/error_log \
+		--pid-path=/var/run/${PN}.pid \
+		--http-client-body-temp-path=/var/tmp/${PN}/client \
+		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
+		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
+		--with-md5-asm \
 		${myconf} || die "configure failed"
 
-	emake || "failed to compile"
+	emake || die "failed to compile"
 }
 
 src_install() {
-	cd ${S} || die
-
-	dodir /var/log/${PN}
-	keepdir /var/log/${PN}
-
-	dodir /var/tmp/${PN}
-
-	dodir /var/tmp/${PN}/client
-	keepdir /var/tmp/${PN}/client
-
-	dodir /var/tmp/${PN}/proxy
-	keepdir /var/tmp/${PN}/proxy
-
-	dodir /var/tmp/${PN}/fastcgi
-	keepdir /var/tmp/${PN}/fastcgi
+	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
 
 	dodir /etc/${PN}
 
diff --git a/www-servers/nginx/nginx-0.1.35.ebuild b/www-servers/nginx/nginx-0.1.35.ebuild
index 9ae98f4d7b49..ece86d21b1d0 100644
--- a/www-servers/nginx/nginx-0.1.35.ebuild
+++ b/www-servers/nginx/nginx-0.1.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.35.ebuild,v 1.2 2005/06/08 09:06:11 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.35.ebuild,v 1.3 2005/07/10 21:38:22 swegener Exp $
 
 inherit eutils
 
@@ -41,37 +41,23 @@ src_compile() {
 	use debug	&& myconf="${myconf} --with-debug"
 	use ssl		&& myconf="${myconf} --with-http_ssl_module"
 
-	cd ${S} && ./configure									\
-		--prefix=/usr										\
-		--conf-path=/etc/${PN}/${PN}.conf					\
-		--http-log-path=/var/log/${PN}/access_log			\
-		--error-log-path=/var/log/${PN}/error_log			\
-		--pid-path=/var/run/${PN}.pid						\
-		--http-client-body-temp-path=/var/tmp/${PN}/client	\
-		--http-proxy-temp-path=/var/tmp/${PN}/proxy			\
-		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi		\
-		--with-md5-asm										\
+	./configure \
+		--prefix=/usr \
+		--conf-path=/etc/${PN}/${PN}.conf \
+		--http-log-path=/var/log/${PN}/access_log \
+		--error-log-path=/var/log/${PN}/error_log \
+		--pid-path=/var/run/${PN}.pid \
+		--http-client-body-temp-path=/var/tmp/${PN}/client \
+		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
+		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
+		--with-md5-asm \
 		${myconf} || die "configure failed"
 
-	emake || "failed to compile"
+	emake || die "failed to compile"
 }
 
 src_install() {
-	cd ${S} || die
-
-	dodir /var/log/${PN}
-	keepdir /var/log/${PN}
-
-	dodir /var/tmp/${PN}
-
-	dodir /var/tmp/${PN}/client
-	keepdir /var/tmp/${PN}/client
-
-	dodir /var/tmp/${PN}/proxy
-	keepdir /var/tmp/${PN}/proxy
-
-	dodir /var/tmp/${PN}/fastcgi
-	keepdir /var/tmp/${PN}/fastcgi
+	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
 
 	dodir /etc/${PN}
 
diff --git a/www-servers/nginx/nginx-0.1.36.ebuild b/www-servers/nginx/nginx-0.1.36.ebuild
index 6ad3a542d8f3..441c5443530d 100644
--- a/www-servers/nginx/nginx-0.1.36.ebuild
+++ b/www-servers/nginx/nginx-0.1.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.36.ebuild,v 1.1 2005/06/16 09:00:49 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.36.ebuild,v 1.2 2005/07/10 21:38:22 swegener Exp $
 
 inherit eutils
 
@@ -41,37 +41,23 @@ src_compile() {
 	use debug	&& myconf="${myconf} --with-debug"
 	use ssl		&& myconf="${myconf} --with-http_ssl_module"
 
-	cd ${S} && ./configure									\
-		--prefix=/usr										\
-		--conf-path=/etc/${PN}/${PN}.conf					\
-		--http-log-path=/var/log/${PN}/access_log			\
-		--error-log-path=/var/log/${PN}/error_log			\
-		--pid-path=/var/run/${PN}.pid						\
-		--http-client-body-temp-path=/var/tmp/${PN}/client	\
-		--http-proxy-temp-path=/var/tmp/${PN}/proxy			\
-		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi		\
-		--with-md5-asm										\
+	./configure \
+		--prefix=/usr \
+		--conf-path=/etc/${PN}/${PN}.conf \
+		--http-log-path=/var/log/${PN}/access_log \
+		--error-log-path=/var/log/${PN}/error_log \
+		--pid-path=/var/run/${PN}.pid \
+		--http-client-body-temp-path=/var/tmp/${PN}/client \
+		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
+		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
+		--with-md5-asm \
 		${myconf} || die "configure failed"
 
-	emake || "failed to compile"
+	emake || die "failed to compile"
 }
 
 src_install() {
-	cd ${S} || die
-
-	dodir /var/log/${PN}
-	keepdir /var/log/${PN}
-
-	dodir /var/tmp/${PN}
-
-	dodir /var/tmp/${PN}/client
-	keepdir /var/tmp/${PN}/client
-
-	dodir /var/tmp/${PN}/proxy
-	keepdir /var/tmp/${PN}/proxy
-
-	dodir /var/tmp/${PN}/fastcgi
-	keepdir /var/tmp/${PN}/fastcgi
+	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
 
 	dodir /etc/${PN}
 
diff --git a/www-servers/nginx/nginx-0.1.37.ebuild b/www-servers/nginx/nginx-0.1.37.ebuild
index 10a88af59289..da3785e3bbf3 100644
--- a/www-servers/nginx/nginx-0.1.37.ebuild
+++ b/www-servers/nginx/nginx-0.1.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.37.ebuild,v 1.1 2005/06/23 13:53:59 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-0.1.37.ebuild,v 1.2 2005/07/10 21:38:22 swegener Exp $
 
 inherit eutils
 
@@ -35,37 +35,23 @@ src_compile() {
 	use debug	&& myconf="${myconf} --with-debug"
 	use ssl		&& myconf="${myconf} --with-http_ssl_module"
 
-	cd ${S} && ./configure									\
-		--prefix=/usr										\
-		--conf-path=/etc/${PN}/${PN}.conf					\
-		--http-log-path=/var/log/${PN}/access_log			\
-		--error-log-path=/var/log/${PN}/error_log			\
-		--pid-path=/var/run/${PN}.pid						\
-		--http-client-body-temp-path=/var/tmp/${PN}/client	\
-		--http-proxy-temp-path=/var/tmp/${PN}/proxy			\
-		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi		\
-		--with-md5-asm										\
+	./configure \
+		--prefix=/usr \
+		--conf-path=/etc/${PN}/${PN}.conf \
+		--http-log-path=/var/log/${PN}/access_log \
+		--error-log-path=/var/log/${PN}/error_log \
+		--pid-path=/var/run/${PN}.pid \
+		--http-client-body-temp-path=/var/tmp/${PN}/client \
+		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
+		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
+		--with-md5-asm \
 		${myconf} || die "configure failed"
 
-	emake || "failed to compile"
+	emake || die "failed to compile"
 }
 
 src_install() {
-	cd ${S} || die
-
-	dodir /var/log/${PN}
-	keepdir /var/log/${PN}
-
-	dodir /var/tmp/${PN}
-
-	dodir /var/tmp/${PN}/client
-	keepdir /var/tmp/${PN}/client
-
-	dodir /var/tmp/${PN}/proxy
-	keepdir /var/tmp/${PN}/proxy
-
-	dodir /var/tmp/${PN}/fastcgi
-	keepdir /var/tmp/${PN}/fastcgi
+	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi}
 
 	dodir /etc/${PN}