Minor sytax changes; rm -j1 from install, added die statements, prepared by Ian Delaney aka idella4

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

3 files changed, 31 insertions, 16 deletions

diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog
index c8eecf71e334..a06acb87390e 100644
--- a/app-emulation/xen-pvgrub/ChangeLog
+++ b/app-emulation/xen-pvgrub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/xen-pvgrub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.9 2011/11/01 10:19:29 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.10 2011/11/07 17:40:42 alexxy Exp $
+
+  07 Nov 2011; Alexey Shvetsov <alexxy@gentoo.org> xen-pvgrub-4.1.2.ebuild:
+  Minor sytax changes; rm -j1 from install, added die statements, prepared by
+  Ian Delaney aka idella4
 
   01 Nov 2011; Tony Vroon <chainsaw@gentoo.org> xen-pvgrub-4.1.1-r1.ebuild:
   Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index e3581ee9c8f4..b5f0815169f6 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
 DIST lwip-1.3.0.tar.gz 398933 RMD160 72c63bf5e3b29e185c46a5fc116146ea902def83 SHA1 241f917ba9dffc614346472e3c5871217ad0a91c SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f
@@ -10,14 +10,24 @@ DIST xen-4.1.1.tar.gz 10355625 RMD160 4b3c0641b0f098889f627662aa6b8fea00c5b636 S
 DIST xen-4.1.2.tar.gz 10365786 RMD160 457797ec4be286afbbcad940a9ce04e44f3f40d6 SHA1 db584cb0a0cc614888d7df3b196d514fdb2edd6e SHA256 7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d
 DIST zlib-1.2.3.tar.gz 496597 RMD160 89a57e336c24f7f6eebda3a1724e14b71187e117 SHA1 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e
 EBUILD xen-pvgrub-4.1.1-r1.ebuild 4349 RMD160 cc2af3e579cca8ecb128588d8ccfa87bb6410f82 SHA1 01bfe40e66a3844197573a7f72939d80695276bb SHA256 ec5f6334bc11f842b5771fc974faf6a4bdffb273a3e7a700dc7876d6abe53875
-EBUILD xen-pvgrub-4.1.2.ebuild 4239 RMD160 b7f0366a1142d8b0070495d11cce4fadcb627c3f SHA1 bc426307810b44a8a055bcd922984970c1fc3561 SHA256 235a3ff47d015dde2c8a204877c15476236d56088bd13b8113b81c9dc62288a0
+EBUILD xen-pvgrub-4.1.2.ebuild 4211 RMD160 ca4c438101411b80879e49548fa123a804cce78e SHA1 db72ae1d8d5abf3392cf585fa9f004c07e54f721 SHA256 eb78b4414cafef215fac53c8c05f22138e1e031a49bd4da56abcd702d5263b9b
 EBUILD xen-pvgrub-9999.ebuild 3466 RMD160 68770effb33a802ee204b3f4f05316a2b104435a SHA1 c93c306847180ae3ad1ac1dade6323519e12faf0 SHA256 4e41e7a47c381e9dc11800bfa9838f45432efafd6dbc1d482810d17830eaf888
-MISC ChangeLog 2002 RMD160 084aad22485f1165ddbf73cd21f50e94349e2ca8 SHA1 92aeebb48bde96388b9f7c75b22164710d8bfcef SHA256 b5930f2bd070d2b57ca9aad0db76fa872d2e5f2ff813df6e1d6cffd7c2d6653a
+MISC ChangeLog 2182 RMD160 e7726e961a630ab095156587b807c1d63d10f094 SHA1 e08ac9c66e4afa7b5ecdfe3b4e624e7177964a65 SHA256 a0df0188cf46be8f84fd1f65eb4374d4163e018b1d16040972940aebcae48399
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6vx8QACgkQp5vW4rUFj5rjVACgwiFYMwCsEwTtL5w9rMFIlBlw
-cJsAoIc9UCTGuqjlQldmjw+iJKRX2sFc
-=zpcA
+iQIcBAEBCAAGBQJOuBgWAAoJEOf+E+/4L5LmUqEQAJDGgjNAKZgKiu2YxB2JsoEB
+7Bs17BxVxhx5EKDEQlpGlMDKJ1zeKqPpj3U9pdfuc0zC+rDCHfEiO4wwLX2IYYYg
+eZuno6p4KgLRQzbjCoZ0dOYpjQ8CziCwvq9rnVhj5MHPyiiFTtO54wpsmGpQgTHl
+AxbbttTHM4zg1yINUHOTMi2L08kWqPHFSsSqNynaJAEAqwB60oBG8VT8MG036FIc
+PsvUBcnwpY/YMAn3GnHMnwMRjoaRTQmK93hGxzppnAKqbuwctK5Kr064yUfuybnq
+bqFyVZnQnbYBj4KpBz1Yba6+LonJuvNTD/yKnptznXq4nzex1pW1FqVyCcw2UAE/
+BLVEJ5QJs26T/HMp2Nbnw1RY7+awKNB2BSi1mV6HLIW+4JSIZf61FZn2qwEcnlmT
+ttRCedgUvGymJ9g0k1ukuHYoyJSvFpU7QKer/5pbrBm7Fv4J0g7ufsrgBCbu1de2
+d/TwJ727+PAa7u7G2C4nqBe+77UAe0aeyFHQtpFeiaOZQ9F6VmmWC1x8xJhRcnud
+yPVrecLq+hfe2IzUds7tOvQdADjkOadPY8cMYQzLC0XPE+CsEvJmL5WAb8JqgcwJ
+Ei+twn11cNEDxRKYnWE4o7No7AIHJY0/KeyRSMTIUFTbEVS3CE3WheKIt8XvwpwY
+uGJRsBB7LwEUt7QIERfe
+=nqYy
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
index 462f8be8b731..668ac0e44d04 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.1 2011/10/25 18:47:03 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.1.2.ebuild,v 1.2 2011/11/07 17:40:42 alexxy Exp $
 
 EAPI="2"
 
@@ -80,7 +80,6 @@ src_prepare() {
 		-e 's:^\t$(WGET) $(OCAML_URL):#\t$(WGET) $(OCAML_URL):' \
 		-e 's:^\t$(WGET) $(GRUB_URL):#$(WGET) $(GRUB_URL):' \
                 -i stubdom/Makefile || die "stubdom/Makefile could not be adjusted"
-        einfo "1st Makefile adjusted"
 }
 
 src_compile() {
@@ -89,32 +88,34 @@ src_compile() {
 		append-flags -fno-strict-overflow
 	fi
 
-	emake CC=$(tc-getCC) LD=$(tc-getLD) -C tools/include || die "prepare libelf headers failed"
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" -C tools/include || die "prepare libelf headers failed"
 
 	if use x86; then
-		emake -j1 CC=$(tc-getCC) LD=$(tc-getLD) \
+		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
 		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || \
 		die "compile pv-grub_x86_32 failed"
 	fi
 	if use amd64; then
-		emake -j1 CC=$(tc-getCC) LD=$(tc-getLD) \
+		emake -j1 CC="$(tc-getCC)" LD="$(tc-getLD)" \
 		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub || \
 		die "compile pv-grub_x86_64 failed"
 		if use multilib; then
 			multilib_toolchain_setup x86
-			emake -j1 XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || die "compile pv-grub_x86_32 failed"
+			emake -j1 \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub || \
+			die "compile pv-grub_x86_32 failed"
 		fi
 	fi
 }
 
 src_install() {
 	if use x86; then
-		emake -j1 XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
 	fi
 	if use amd64; then
-		emake -j1 XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_64 failed"
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_64 failed"
 		if use multilib; then
-			emake -j1 XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub || die "install pv-grub_x86_32 failed"
 		fi
 	fi
 }