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

Package-Manager: portage-2.1.4.1

4 files changed, 23 insertions, 17 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/Manifest b/dev-util/astyle/Manifest
index 04e48a423f4f..56afe6b1ba43 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -4,7 +4,7 @@ AUX cmd-line-fix.diff 5830 RMD160 59d4e4b085ac8a64ffc6ed3ad91ab9ec4f04ac41 SHA1
 DIST astyle_1.15.3.zip 60880 RMD160 ec84150edbe09dcd62ef960f288b688b52553d8b SHA1 51e115d1f84028899fff1725d4c6298d5e191ea4 SHA256 091adc2dbdcc7532c70dfb00e46361271c23726baa9cd0e5e0e3616838693c75
 DIST astyle_1.21_linux.tar.gz 81678 RMD160 929134074557865b95d25b84093851a9240f65ac SHA1 914493e4834183b2544a9baff2898597ab12ef29 SHA256 894ed6838e61977ee846c219c0e0caa2eaf3f6d9f1df4ed354a8cd45c32d0ec2
 EBUILD astyle-1.15.3-r1.ebuild 833 RMD160 e00c05a85a43ce4567d0748d4f48ac8eda4aeec3 SHA1 471bc3e2cc3e7f37d1978dcf6a28e324b30f0f9b SHA256 b858d6a3b262d379cb2234ebbe12463e5464292c9a2224aa157468160bd32a9c
-EBUILD astyle-1.15.3.ebuild 808 RMD160 5e8c3b0f0fe7d2eaac6b12533c035a9a10e35f1f SHA1 bed52623d4ed46714145e0280e136db3f73e8b25 SHA256 1b6c060474365c29fdd1e4cfa881f10b7d873094652740bb57194ebdf99eb469
-EBUILD astyle-1.21.ebuild 1335 RMD160 0d8f3418bdbc00cb7a0169d49e56e6c18190c563 SHA1 a0b41ca4eaca3e04527f22f4905bc951488b011d SHA256 49ab55cbf613b672128a440f9cf22421aa25bc991ca51e6c0bfa41a26d8e9407
-MISC ChangeLog 2179 RMD160 399d25bc446615bed8e8579399c79d8dfa860433 SHA1 5514a5d9a4391f279620437bfeb3bcf9af614f0a SHA256 049108a6dea18e2d672ebc00f06b510b3b32efdbd0a881cb723878668a2139cb
+EBUILD astyle-1.15.3.ebuild 813 RMD160 c56cb404c14e49b13f379ad4850bc75edd740b66 SHA1 f0609e9d51b06d23b4b0438ad16e0fc1a064979d SHA256 87e52c827d06b6f3093cde884a33b78a4daf814132d7af616cd99e3548344a4b
+EBUILD astyle-1.21.ebuild 1567 RMD160 7fd9bd95a00f28a0a5e7d81f07315630ba1a1fc4 SHA1 9e1b38faa42150b7a62428e10940b1f0822cdc83 SHA256 5cd3e8344f2458dda992f06bbadfcf25b1e698bc0e2e1457e369d2fc886b6904
+MISC ChangeLog 2380 RMD160 7b38488c741114543143ed2a73ec64b8f1179ccc SHA1 53d84345ee8d49fc4b71464fd8a7713d9ca8bd28 SHA256 b4e5d3ddebae8c46f792d9d05610fca3b31b126ca06ade7e1d9c08538c690d9e
 MISC metadata.xml 1751 RMD160 2b19c912e2ed3fffde21fc78e709adfa01f3f306 SHA1 282847bdb605ee83bc032eeb02922d36e13ba90d SHA256 f7b72e8fca0bd5a04e471921afc936fdd51530996f661d3268fd6eb88e50249f
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
 }