Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Date: Sun, 01 Jul 2012 21:31:32
Message-Id: 20120701213116.B4A192004B@flycatcher.gentoo.org
1 floppym 12/07/01 21:31:16
2
3 Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
4 Log:
5 Add patch to fix build race for bug 424231 by Wonko.
6
7 (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.75 sys-boot/grub/grub-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.75&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.75&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.74&r2=1.75
15
16 Index: grub-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
19 retrieving revision 1.74
20 retrieving revision 1.75
21 diff -u -r1.74 -r1.75
22 --- grub-9999.ebuild 29 Jun 2012 22:06:15 -0000 1.74
23 +++ grub-9999.ebuild 1 Jul 2012 21:31:16 -0000 1.75
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.74 2012/06/29 22:06:15 floppym Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.75 2012/07/01 21:31:16 floppym Exp $
29
30 EAPI=4
31
32 @@ -19,6 +19,7 @@
33 fi
34 KEYWORDS="~amd64 ~x86"
35 S=${WORKDIR}/${MY_P}
36 + DO_AUTORECONF="true"
37 fi
38
39 inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
40 @@ -70,6 +71,7 @@
41 >=dev-lang/python-2.5.2
42 sys-devel/flex
43 sys-devel/bison
44 + sys-apps/help2man
45 sys-apps/texinfo
46 static? (
47 truetype? (
48 @@ -84,7 +86,7 @@
49 grub_platforms_efi-64? ( sys-boot/efibootmgr )
50 "
51 if [[ -n ${DO_AUTORECONF} ]] ; then
52 - DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
53 + DEPEND+=" >=sys-devel/autogen-5.10"
54 else
55 DEPEND+=" app-arch/xz-utils"
56 fi
57 @@ -207,6 +209,8 @@
58 src_prepare() {
59 local i j
60
61 + epatch "${FILESDIR}/${P}-manpage-race.patch"
62 +
63 # fix texinfo file name, bug 416035
64 sed -i \
65 -e 's/^\* GRUB:/* GRUB2:/' \
66
67
68
69 1.9 sys-boot/grub/grub-2.00.ebuild
70
71 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.9&view=markup
72 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.9&content-type=text/plain
73 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.8&r2=1.9
74
75 Index: grub-2.00.ebuild
76 ===================================================================
77 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
78 retrieving revision 1.8
79 retrieving revision 1.9
80 diff -u -r1.8 -r1.9
81 --- grub-2.00.ebuild 29 Jun 2012 22:06:15 -0000 1.8
82 +++ grub-2.00.ebuild 1 Jul 2012 21:31:16 -0000 1.9
83 @@ -1,6 +1,6 @@
84 # Copyright 1999-2012 Gentoo Foundation
85 # Distributed under the terms of the GNU General Public License v2
86 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.8 2012/06/29 22:06:15 floppym Exp $
87 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.9 2012/07/01 21:31:16 floppym Exp $
88
89 EAPI=4
90
91 @@ -19,6 +19,7 @@
92 fi
93 KEYWORDS="~amd64 ~x86"
94 S=${WORKDIR}/${MY_P}
95 + DO_AUTORECONF="true"
96 fi
97
98 inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
99 @@ -70,6 +71,7 @@
100 >=dev-lang/python-2.5.2
101 sys-devel/flex
102 sys-devel/bison
103 + sys-apps/help2man
104 sys-apps/texinfo
105 static? (
106 truetype? (
107 @@ -84,7 +86,7 @@
108 grub_platforms_efi-64? ( sys-boot/efibootmgr )
109 "
110 if [[ -n ${DO_AUTORECONF} ]] ; then
111 - DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
112 + DEPEND+=" >=sys-devel/autogen-5.10"
113 else
114 DEPEND+=" app-arch/xz-utils"
115 fi
116 @@ -207,6 +209,8 @@
117 src_prepare() {
118 local i j
119
120 + epatch "${FILESDIR}/${P}-manpage-race.patch"
121 +
122 # fix texinfo file name, bug 416035
123 sed -i \
124 -e 's/^\* GRUB:/* GRUB2:/' \
125
126
127
128 1.224 sys-boot/grub/ChangeLog
129
130 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.224&view=markup
131 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.224&content-type=text/plain
132 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.223&r2=1.224
133
134 Index: ChangeLog
135 ===================================================================
136 RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
137 retrieving revision 1.223
138 retrieving revision 1.224
139 diff -u -r1.223 -r1.224
140 --- ChangeLog 29 Jun 2012 22:06:15 -0000 1.223
141 +++ ChangeLog 1 Jul 2012 21:31:16 -0000 1.224
142 @@ -1,6 +1,11 @@
143 # ChangeLog for sys-boot/grub
144 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
145 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.223 2012/06/29 22:06:15 floppym Exp $
146 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.224 2012/07/01 21:31:16 floppym Exp $
147 +
148 + 01 Jul 2012; Mike Gilbert <floppym@g.o>
149 + +files/grub-2.00-manpage-race.patch,
150 + -files/grub-2.00-10_linux-genkernel.patch, grub-2.00.ebuild, grub-9999.ebuild:
151 + Add patch to fix build race for bug 424231 by Wonko.
152
153 29 Jun 2012; Mike Gilbert <floppym@g.o> grub-2.00.ebuild,
154 grub-9999.ebuild:
Report Message
Find on MARC Find on Google Groups