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 1SlRjv-0005I9-Ml for garchives@archives.gentoo.org; Sun, 01 Jul 2012 21:31:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E69CE0768; Sun, 1 Jul 2012 21:31:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1F133E0764 for ; Sun, 1 Jul 2012 21:31:19 +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 42D671B400C for ; Sun, 1 Jul 2012 21:31:18 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2304) id B4A192004B; Sun, 1 Jul 2012 21:31:16 +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: <20120701213116.B4A192004B@flycatcher.gentoo.org> Date: Sun, 1 Jul 2012 21:31:16 +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: ea76368d-2fce-445a-955a-1c644ea157cd X-Archives-Hash: 22b66734af5701281c9dc25a5badc2a6 floppym 12/07/01 21:31:16 Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog Log: Add patch to fix build race for bug 424231 by Wonko. =20 (Portage version: 2.2.0_alpha114/cvs/Linux x86_64) Revision Changes Path 1.75 sys-boot/grub/grub-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?rev=3D1.75&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?rev=3D1.75&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -9999.ebuild?r1=3D1.74&r2=3D1.75 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.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- grub-9999.ebuild 29 Jun 2012 22:06:15 -0000 1.74 +++ grub-9999.ebuild 1 Jul 2012 21:31:16 -0000 1.75 @@ -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.74= 2012/06/29 22:06:15 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.75= 2012/07/01 21:31:16 floppym Exp $ =20 EAPI=3D4 =20 @@ -19,6 +19,7 @@ fi KEYWORDS=3D"~amd64 ~x86" S=3D${WORKDIR}/${MY_P} + DO_AUTORECONF=3D"true" fi =20 inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+a= utotools} ${LIVE_ECLASS} @@ -70,6 +71,7 @@ >=3Ddev-lang/python-2.5.2 sys-devel/flex sys-devel/bison + sys-apps/help2man sys-apps/texinfo static? ( truetype? ( @@ -84,7 +86,7 @@ grub_platforms_efi-64? ( sys-boot/efibootmgr ) " if [[ -n ${DO_AUTORECONF} ]] ; then - DEPEND+=3D" >=3Dsys-devel/autogen-5.10 sys-apps/help2man" + DEPEND+=3D" >=3Dsys-devel/autogen-5.10" else DEPEND+=3D" app-arch/xz-utils" fi @@ -207,6 +209,8 @@ src_prepare() { local i j =20 + epatch "${FILESDIR}/${P}-manpage-race.patch" + # fix texinfo file name, bug 416035 sed -i \ -e 's/^\* GRUB:/* GRUB2:/' \ 1.9 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.9&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -2.00.ebuild?rev=3D1.9&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub= -2.00.ebuild?r1=3D1.8&r2=3D1.9 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- grub-2.00.ebuild 29 Jun 2012 22:06:15 -0000 1.8 +++ grub-2.00.ebuild 1 Jul 2012 21:31:16 -0000 1.9 @@ -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.8 = 2012/06/29 22:06:15 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.9 = 2012/07/01 21:31:16 floppym Exp $ =20 EAPI=3D4 =20 @@ -19,6 +19,7 @@ fi KEYWORDS=3D"~amd64 ~x86" S=3D${WORKDIR}/${MY_P} + DO_AUTORECONF=3D"true" fi =20 inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+a= utotools} ${LIVE_ECLASS} @@ -70,6 +71,7 @@ >=3Ddev-lang/python-2.5.2 sys-devel/flex sys-devel/bison + sys-apps/help2man sys-apps/texinfo static? ( truetype? ( @@ -84,7 +86,7 @@ grub_platforms_efi-64? ( sys-boot/efibootmgr ) " if [[ -n ${DO_AUTORECONF} ]] ; then - DEPEND+=3D" >=3Dsys-devel/autogen-5.10 sys-apps/help2man" + DEPEND+=3D" >=3Dsys-devel/autogen-5.10" else DEPEND+=3D" app-arch/xz-utils" fi @@ -207,6 +209,8 @@ src_prepare() { local i j =20 + epatch "${FILESDIR}/${P}-manpage-race.patch" + # fix texinfo file name, bug 416035 sed -i \ -e 's/^\* GRUB:/* GRUB2:/' \ 1.224 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?rev=3D1.224&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?rev=3D1.224&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/Chan= geLog?r1=3D1.223&r2=3D1.224 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.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- ChangeLog 29 Jun 2012 22:06:15 -0000 1.223 +++ ChangeLog 1 Jul 2012 21:31:16 -0000 1.224 @@ -1,6 +1,11 @@ # 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.223 2012/= 06/29 22:06:15 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.224 2012/= 07/01 21:31:16 floppym Exp $ + + 01 Jul 2012; Mike Gilbert + +files/grub-2.00-manpage-race.patch, + -files/grub-2.00-10_linux-genkernel.patch, grub-2.00.ebuild, grub-9999= .ebuild: + Add patch to fix build race for bug 424231 by Wonko. =20 29 Jun 2012; Mike Gilbert grub-2.00.ebuild, grub-9999.ebuild: