fixed string quoting and added some dies to the manual install commands

(Portage version: 2.1.4.1)

3 files changed, 20 insertions, 14 deletions

diff --git a/dev-util/astyle/ChangeLog b/dev-util/astyle/ChangeLog
index 33298fa2e2ac..48d13ca71893 100644
--- a/dev-util/astyle/ChangeLog
+++ b/dev-util/astyle/ChangeLog
@@ -1,13 +1,17 @@
 # ChangeLog for dev-util/astyle
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.19 2008/01/27 10:39:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.20 2008/02/04 03:58:43 nerdboy Exp $
+
+  04 Feb 2008; Steve Arnold <nerdboy@gentoo.org> astyle-1.21.ebuild:
+  Fixed string quoting and added some dies to the manual install commands,
+  but only in the latest version; emake works so far...
 
   27 Jan 2008; Fabian Groffen <grobian@gentoo.org> astyle-1.15.3-r1.ebuild,
   astyle-1.21.ebuild:
   Dropped ppc-macos keyword, see you in prefix
 
   14 Nov 2007; Robin H. Johnson <robbat2@gentoo.org> astyle-1.21.ebuild:
-  Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.19 2008/01/27 10:39:22 grobian Exp $ string.
+  Fix $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/ChangeLog,v 1.20 2008/02/04 03:58:43 nerdboy Exp $ string.
 
 *astyle-1.21 (07 Oct 2007)
 
diff --git a/dev-util/astyle/astyle-1.15.3.ebuild b/dev-util/astyle/astyle-1.15.3.ebuild
index 581d27997072..37748c966b56 100644
--- a/dev-util/astyle/astyle-1.15.3.ebuild
+++ b/dev-util/astyle/astyle-1.15.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.15.3.ebuild,v 1.14 2004/11/08 21:36:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.15.3.ebuild,v 1.15 2008/02/04 03:58:43 nerdboy Exp $
 
 inherit eutils
 
@@ -19,10 +19,10 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/cmd-line-fix.diff
+	epatch "${FILESDIR}"/cmd-line-fix.diff
 
 	#gcc-3.4 fix
-	epatch ${FILESDIR}/${PN}-gcc34.patch
+	epatch "${FILESDIR}"/${PN}-gcc34.patch
 }
 
 src_compile() {
diff --git a/dev-util/astyle/astyle-1.21.ebuild b/dev-util/astyle/astyle-1.21.ebuild
index 5621fd3aaf18..d39b06642d5d 100644
--- a/dev-util/astyle/astyle-1.21.ebuild
+++ b/dev-util/astyle/astyle-1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.21.ebuild,v 1.3 2008/01/27 10:39:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/astyle/astyle-1.21.ebuild,v 1.4 2008/02/04 03:58:43 nerdboy Exp $
 
 inherit eutils
 
@@ -37,23 +37,25 @@ src_compile() {
 		build_targets="release static shared"
 	    fi
 	fi
-	make ${build_targets} || die "build failed"
+	emake ${build_targets} || die "build failed"
 }
 
 src_install() {
 	if use debug; then
-	    newbin bin/astyled astyle
+	    newbin bin/astyled astyle || die "install debug bin failed"
 	    if use libs; then
-		newlib.a bin/libastyled.a libastyle.a
+		newlib.a bin/libastyled.a libastyle.a  \
+		    || die "install debug static lib failed"
 		# shared lib needs at least a soname patch
-		newlib.so bin/libastyled.so libastyle.so
+		newlib.so bin/libastyled.so libastyle.so \
+		    || die "install debug shared lib failed"
 	    fi
 	else
 	    if use libs; then
-		dolib.a bin/libastyle.a
-		dolib.so bin/libastyle.so
+		dolib.a bin/libastyle.a || die "install static lib failed"
+		dolib.so bin/libastyle.so || die "install shared lib failed"
 	    fi
-	    dobin bin/astyle
+	    dobin bin/astyle || die "install bin failed"
 	fi
 	dohtml doc/*.html
 }