Unset CCASFLAGS. Reported by tommy.

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

4 files changed, 21 insertions, 13 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 0adebe1068b4..8a9264a05330 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.224 2012/07/01 21:31:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.225 2012/07/01 22:11:04 floppym Exp $
+
+  01 Jul 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+  grub-9999.ebuild:
+  Unset CCASFLAGS. Reported by tommy.
 
   01 Jul 2012; Mike Gilbert <floppym@gentoo.org>
   +files/grub-2.00-manpage-race.patch,
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1cfcab5867dd..a7d6037c91b0 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -50,15 +50,15 @@ EBUILD grub-0.97-r8.ebuild 8948 RMD160 16358e22e4806fce95513bc4faff3ba01ababd21
 EBUILD grub-0.97-r9.ebuild 9053 RMD160 23b5973daff5607e8e35d9746cef8c86a1de0a1b SHA1 944114e731617a4b967d0539377c59f1a8667871 SHA256 b6411eb5c379cc6b9120f1f727733d9724c4257405c3a7a1935b2aa573085726
 EBUILD grub-0.97.ebuild 4238 RMD160 498e38af891b8e1a147356f4e1c97ca12c2a6429 SHA1 1bd9a4792eaca92500c0c40e9dedda8fead92c27 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1
 EBUILD grub-1.99-r2.ebuild 8413 RMD160 77c4579d76acd48b3a1d5f4784fb512df3002007 SHA1 ed90c12ebc31d4729230fa6daf67b5d310c2c131 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585
-EBUILD grub-2.00.ebuild 7652 RMD160 4e8592e8f5a557f2a32b27f6ab352620aec3f38f SHA1 e2b24619f58388c78851f5f7f8879195ae3a9059 SHA256 6bc58f45c585291115b533d9cac8fa8829f86dfa3ff21a096cc21f3c80342c6a
+EBUILD grub-2.00.ebuild 7698 RMD160 5280f23fc1c94ce296d69067702a3a24bc75266d SHA1 c712be33933c7534ae0eafd2302a46c59383ba9a SHA256 cf1db595503ade5c84f75a051368fc3aafa1b855ef3b436aff5358d1a690fadd
 EBUILD grub-2.00_beta6.ebuild 7140 RMD160 a514ef13f06d98a97469f4e7e8ede54b81dae133 SHA1 36b3cf0674c1c4170bceb50015f4e58d00f61dfd SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68
-EBUILD grub-9999.ebuild 7653 RMD160 c8bc739bd021cb5aad22e34e761a04efb86fb621 SHA1 f66491c117ad8f24a7e0e50fcd65aa73f071a65f SHA256 e31b7f1dce466c91edc61e927d04a61dc05098005655f31f99a6993da2f10acd
-MISC ChangeLog 44287 RMD160 9cc487df3f8109eb974a7e11bb6135e5222f8ca3 SHA1 8e704beaa4d6e5ade1693d687a85695df805222a SHA256 b55cdb6c45a96673500af7e8ee75e5ef8cb8a47b1addaad9a296c80e667c6b4b
+EBUILD grub-9999.ebuild 7698 RMD160 522079be797ac844d282ad860be8269d9d434e27 SHA1 b6c0bf8fb2701a62ea80fbef1943abd81802a833 SHA256 bfd3f6be184b5f11430b163d92a9e2e24fc7bf10494a98e40b92a0dfcb98f0af
+MISC ChangeLog 44413 RMD160 fe82a1142e44a4b2b58417a148e637429be3d6ff SHA1 246f507d993b6d5970ca1d2b7572463f16a674d9 SHA256 9a1ae1e4a39fef0ab6e47cc07cab1c4043a005b7573d44c5ffbd03d4116e019b
 MISC metadata.xml 607 RMD160 4d6c4e92248479483d0ca45a34567921ad970b86 SHA1 fd20ee64f83670b9bd29b2cbe9a93508af9fe0bd SHA256 5deec975010a509f536573e173aa1918e0c5b8993191064d1fd7914edc0c13e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/wwaoACgkQC77qH+pIQ6Q9zQEAmlZIoldjn9edFxek3fTci6i1
-zlgolGDuwoOrCNlcwQ4BAJ+xMl4+VJLHuFcvKZE6NMmZ7cC/0xhiSuWGNoa5j5mp
-=FVZJ
+iF4EAREIAAYFAk/wyv8ACgkQC77qH+pIQ6Q2qAEAhes+AQqxcK19sC8u37alq/A+
+n9Nq0w3qvtzKfftovdoBAMJyGqebgLWtX9DSBcYt1glfU/ipIl8jDvjg9bZNJ8iy
+=6eV2
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00.ebuild b/sys-boot/grub/grub-2.00.ebuild
index fd88f36ad0c2..85ea67f6061b 100644
--- a/sys-boot/grub/grub-2.00.ebuild
+++ b/sys-boot/grub/grub-2.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.9 2012/07/01 21:31:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.10 2012/07/01 22:11:04 floppym Exp $
 
 EAPI=4
 
@@ -209,7 +209,9 @@ grub_src_install() {
 src_prepare() {
 	local i j
 
-	epatch "${FILESDIR}/${P}-manpage-race.patch"
+	if [[ ${PV} != 9999 ]]; then
+		epatch "${FILESDIR}/${P}-manpage-race.patch"
+	fi
 
 	# fix texinfo file name, bug 416035
 	sed -i \
@@ -245,7 +247,7 @@ src_prepare() {
 src_configure() {
 	local i
 
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+	use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
 	use static && append-ldflags -static
 
 	# Sandbox bug 404013.
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7ca729d237ea..9e593804912c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.75 2012/07/01 21:31:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.76 2012/07/01 22:11:04 floppym Exp $
 
 EAPI=4
 
@@ -209,7 +209,9 @@ grub_src_install() {
 src_prepare() {
 	local i j
 
-	epatch "${FILESDIR}/${P}-manpage-race.patch"
+	if [[ ${PV} != 9999 ]]; then
+		epatch "${FILESDIR}/${P}-manpage-race.patch"
+	fi
 
 	# fix texinfo file name, bug 416035
 	sed -i \
@@ -245,7 +247,7 @@ src_prepare() {
 src_configure() {
 	local i
 
-	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+	use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
 	use static && append-ldflags -static
 
 	# Sandbox bug 404013.