From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SlSMM-00074e-KD for garchives@archives.gentoo.org; Sun, 01 Jul 2012 22:11:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 639CFE04EB; Sun, 1 Jul 2012 22:11:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B11EE04EB for ; Sun, 1 Jul 2012 22:11:07 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 468D21B4002 for ; Sun, 1 Jul 2012 22:11:06 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2304) id 06DA02004B; Sun, 1 Jul 2012 22:11:05 +0000 (UTC) From: "Mike Gilbert (floppym)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, floppym@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: grub-9999.ebuild grub-2.00.ebuild ChangeLog X-VCS-Directories: sys-boot/grub X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert Content-Type: text/plain; charset=utf8 Message-Id: <20120701221105.06DA02004B@flycatcher.gentoo.org> Date: Sun, 1 Jul 2012 22:11:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6501035e-266d-47b6-9a19-5ecfd7684e03 X-Archives-Hash: b97f014f35bbf33aaf0c30c82ec64914 floppym 12/07/01 22:11:05 Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog Log: Unset CCASFLAGS. Reported by tommy. =20 (Portage version: 2.2.0_alpha114/cvs/Linux x86_64) Revision Changes Path 1.76 sys-boot/grub/grub-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?rev=3D1.76&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?rev=3D1.76&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?r1=3D1.75&r2=3D1.76 Index: grub-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- grub-9999.ebuild 1 Jul 2012 21:31:16 -0000 1.75 +++ grub-9999.ebuild 1 Jul 2012 22:11:04 -0000 1.76 @@ -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 $ =20 EAPI=3D4 =20 @@ -209,7 +209,9 @@ src_prepare() { local i j =20 - epatch "${FILESDIR}/${P}-manpage-race.patch" + if [[ ${PV} !=3D 9999 ]]; then + epatch "${FILESDIR}/${P}-manpage-race.patch" + fi =20 # fix texinfo file name, bug 416035 sed -i \ @@ -245,7 +247,7 @@ src_configure() { local i =20 - use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS + use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS use static && append-ldflags -static =20 # Sandbox bug 404013. 1.10 sys-boot/grub/grub-2.00.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -2.00.ebuild?rev=3D1.10&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -2.00.ebuild?rev=3D1.10&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -2.00.ebuild?r1=3D1.9&r2=3D1.10 Index: grub-2.00.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- grub-2.00.ebuild 1 Jul 2012 21:31:16 -0000 1.9 +++ grub-2.00.ebuild 1 Jul 2012 22:11:04 -0000 1.10 @@ -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 $ =20 EAPI=3D4 =20 @@ -209,7 +209,9 @@ src_prepare() { local i j =20 - epatch "${FILESDIR}/${P}-manpage-race.patch" + if [[ ${PV} !=3D 9999 ]]; then + epatch "${FILESDIR}/${P}-manpage-race.patch" + fi =20 # fix texinfo file name, bug 416035 sed -i \ @@ -245,7 +247,7 @@ src_configure() { local i =20 - use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS + use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS use static && append-ldflags -static =20 # Sandbox bug 404013. 1.225 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?rev=3D1.225&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?rev=3D1.225&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?r1=3D1.224&r2=3D1.225 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- ChangeLog 1 Jul 2012 21:31:16 -0000 1.224 +++ ChangeLog 1 Jul 2012 22:11:04 -0000 1.225 @@ -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 grub-2.00.ebuild, + grub-9999.ebuild: + Unset CCASFLAGS. Reported by tommy. =20 01 Jul 2012; Mike Gilbert +files/grub-2.00-manpage-race.patch,