--- util-linux-2.11z-r1.ebuild.orig	2003-04-19 01:02:25.000000000 -0700
+++ util-linux-2.11z-r1.ebuild.orig	2003-04-19 01:31:18.000000000 -0700
@@ -24,18 +24,15 @@ 
 	!selinux? ( sys-apps/pam-login )
 	selinux? ( sys-apps/shadow )"
 
-
 RDEPEND="${DEPEND} dev-lang/perl
 	nls? ( sys-devel/gettext )"
 
-
 src_unpack() {
 	unpack ${A}
 
 	cd ${S}
 
-	if [ ! -z "`use crypt`" ]
-	then
+	if [ ! -z "`use crypt`" ] ; then
 		epatch ${DISTDIR}/${CRYPT_PATCH_P}.patch.bz2
 	fi
 
@@ -45,7 +42,7 @@ 
 	# Fix unreadable df output
 	epatch ${FILESDIR}/no-symlink-resolve.patch
 
-	cp MCONFIG MCONFIG.orig
+	cp MCONFIG MCONFIG.orig || die
 
 	sed -e "s:-pipe -O2 \$(CPUOPT) -fomit-frame-pointer:${CFLAGS}:" \
 		-e "s:CPU=.*:CPU=${CHOST%%-*}:" \
@@ -54,29 +51,25 @@ 
 		-e "s:HAVE_TSORT=no:HAVE_TSORT=yes:" \
 		-e "s:usr/man:usr/share/man:" \
 		-e "s:usr/info:usr/share/info:" \
-		MCONFIG.orig > MCONFIG
+		MCONFIG.orig > MCONFIG || die
 }
 
 src_compile() {
 
 	./configure || die "config"
 
-	if [ -z "`use nls`" ]
-	then
-		cp defines.h defines.h.orig	
-		grep -v "ENABLE_NLS" \
-			defines.h.orig > defines.h
+	if [ -z "`use nls`" ] ; then
+		cp defines.h defines.h.orig || die
+		grep -v "ENABLE_NLS" defines.h.orig > defines.h || die
 		cp defines.h defines.h.orig
-		grep -v "HAVE_libintl_h" \
-			defines.h.orig > defines.h
+		grep -v "HAVE_libintl_h" defines.h.orig > defines.h || die
 
-		cp Makefile Makefile.orig
-		sed -e "s:SUBDIRS=po \\\:SUBDIRS= \\\:g" \
-			Makefile.orig > Makefile
+		cp Makefile Makefile.orig || die
+		sed -e "s:SUBDIRS=po \\\:SUBDIRS= \\\:g" Makefile.orig > Makefile || die
 	fi
 	
 	emake LDFLAGS="" || die
-	cd sys-utils; makeinfo *.texi || die
+	cd sys-utils && makeinfo *.texi || die
 }
 
 src_install() {
@@ -88,4 +81,3 @@ 
 	docinto examples
 	dodoc example.files/*
 }
-