* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-07-01 21:31 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-07-01 21:31 UTC (permalink / raw
To: gentoo-commits
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.
(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=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.74&r2=1.75
Index: grub-9999.ebuild
===================================================================
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 $
EAPI=4
@@ -19,6 +19,7 @@
fi
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
+ DO_AUTORECONF="true"
fi
inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
@@ -70,6 +71,7 @@
>=dev-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+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+ DEPEND+=" >=sys-devel/autogen-5.10"
else
DEPEND+=" app-arch/xz-utils"
fi
@@ -207,6 +209,8 @@
src_prepare() {
local i j
+ 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=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.8&r2=1.9
Index: grub-2.00.ebuild
===================================================================
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 $
EAPI=4
@@ -19,6 +19,7 @@
fi
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
+ DO_AUTORECONF="true"
fi
inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
@@ -70,6 +71,7 @@
>=dev-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+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+ DEPEND+=" >=sys-devel/autogen-5.10"
else
DEPEND+=" app-arch/xz-utils"
fi
@@ -207,6 +209,8 @@
src_prepare() {
local i j
+ 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/ChangeLog?rev=1.224&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.224&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.223&r2=1.224
Index: ChangeLog
===================================================================
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 <floppym@gentoo.org>
+ +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.
29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
grub-9999.ebuild:
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-10-11 2:14 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-10-11 2:14 UTC (permalink / raw
To: gentoo-commits
floppym 12/10/11 02:14:10
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Install modules in /usr/lib/grub.
(Portage version: 2.2.0_alpha136/cvs/Linux x86_64)
Revision Changes Path
1.82 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.81&r2=1.82
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- grub-9999.ebuild 22 Jul 2012 18:29:50 -0000 1.81
+++ grub-9999.ebuild 11 Oct 2012 02:14:09 -0000 1.82
@@ -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.81 2012/07/22 18:29:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.82 2012/10/11 02:14:09 floppym Exp $
EAPI=4
@@ -176,6 +176,7 @@
ECONF_SOURCE="${S}" \
econf \
+ --libdir=/usr/lib \
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--disable-werror \
--program-prefix= \
1.17 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.16&r2=1.17
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grub-2.00.ebuild 22 Jul 2012 18:29:50 -0000 1.16
+++ grub-2.00.ebuild 11 Oct 2012 02:14:10 -0000 1.17
@@ -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.16 2012/07/22 18:29:50 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.17 2012/10/11 02:14:10 floppym Exp $
EAPI=4
@@ -176,6 +176,7 @@
ECONF_SOURCE="${S}" \
econf \
+ --libdir=/usr/lib \
--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--disable-werror \
--program-prefix= \
1.238 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.238&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.238&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.237&r2=1.238
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- ChangeLog 22 Sep 2012 02:16:23 -0000 1.237
+++ ChangeLog 11 Oct 2012 02:14:10 -0000 1.238
@@ -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.237 2012/09/22 02:16:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.238 2012/10/11 02:14:10 floppym Exp $
+
+ 11 Oct 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Install modules in /usr/lib/grub.
22 Sep 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Clarify metadata.
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-07-22 18:29 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-07-22 18:29 UTC (permalink / raw
To: gentoo-commits
floppym 12/07/22 18:29:50
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Replace previous patch with better version from upstream.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.81 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.80&r2=1.81
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- grub-9999.ebuild 22 Jul 2012 16:43:04 -0000 1.80
+++ grub-9999.ebuild 22 Jul 2012 18:29:50 -0000 1.81
@@ -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.80 2012/07/22 16:43:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.81 2012/07/22 18:29:50 floppym Exp $
EAPI=4
@@ -219,7 +219,7 @@
if [[ ${PV} != 9999 ]]; then
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
- epatch "${FILESDIR}/${P}-gettext_printf.patch" #426364
+ epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
fi
# fix texinfo file name, bug 416035
1.16 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.15&r2=1.16
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- grub-2.00.ebuild 22 Jul 2012 16:43:04 -0000 1.15
+++ grub-2.00.ebuild 22 Jul 2012 18:29:50 -0000 1.16
@@ -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.15 2012/07/22 16:43:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.16 2012/07/22 18:29:50 floppym Exp $
EAPI=4
@@ -219,7 +219,7 @@
if [[ ${PV} != 9999 ]]; then
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
- epatch "${FILESDIR}/${P}-gettext_printf.patch" #426364
+ epatch "${FILESDIR}/${P}-config-quoting.patch" #426364
fi
# fix texinfo file name, bug 416035
1.231 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.231&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.231&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.230&r2=1.231
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- ChangeLog 22 Jul 2012 16:43:04 -0000 1.230
+++ ChangeLog 22 Jul 2012 18:29:50 -0000 1.231
@@ -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.230 2012/07/22 16:43:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.231 2012/07/22 18:29:50 floppym Exp $
+
+ 22 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+ +files/grub-2.00-config-quoting.patch, -files/grub-2.00-gettext_printf.patch,
+ grub-2.00.ebuild, grub-9999.ebuild:
+ Replace previous patch with better version from upstream.
22 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+files/grub-2.00-gettext_printf.patch, grub-2.00.ebuild, grub-9999.ebuild:
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-07-22 16:43 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-07-22 16:43 UTC (permalink / raw
To: gentoo-commits
floppym 12/07/22 16:43:04
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Fix problem with single quotes in translated messages in grub-mkconfig. Bug 426364 by Alex Domingo.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.80 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.79&r2=1.80
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- grub-9999.ebuild 18 Jul 2012 16:34:36 -0000 1.79
+++ grub-9999.ebuild 22 Jul 2012 16:43:04 -0000 1.80
@@ -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.79 2012/07/18 16:34:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.80 2012/07/22 16:43:04 floppym Exp $
EAPI=4
@@ -219,6 +219,7 @@
if [[ ${PV} != 9999 ]]; then
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
+ epatch "${FILESDIR}/${P}-gettext_printf.patch" #426364
fi
# fix texinfo file name, bug 416035
1.15 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.14&r2=1.15
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- grub-2.00.ebuild 18 Jul 2012 16:34:36 -0000 1.14
+++ grub-2.00.ebuild 22 Jul 2012 16:43:04 -0000 1.15
@@ -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.14 2012/07/18 16:34:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.15 2012/07/22 16:43:04 floppym Exp $
EAPI=4
@@ -219,6 +219,7 @@
if [[ ${PV} != 9999 ]]; then
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
+ epatch "${FILESDIR}/${P}-gettext_printf.patch" #426364
fi
# fix texinfo file name, bug 416035
1.230 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.229&r2=1.230
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- ChangeLog 18 Jul 2012 16:34:36 -0000 1.229
+++ ChangeLog 22 Jul 2012 16:43:04 -0000 1.230
@@ -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.229 2012/07/18 16:34:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.230 2012/07/22 16:43:04 floppym Exp $
+
+ 22 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+ +files/grub-2.00-gettext_printf.patch, grub-2.00.ebuild, grub-9999.ebuild:
+ Fix problem with single quotes in translated messages in grub-mkconfig. Bug
+ 426364 by Alex Domingo.
18 Jul 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
grub-9999.ebuild:
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-07-18 16:34 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-07-18 16:34 UTC (permalink / raw
To: gentoo-commits
floppym 12/07/18 16:34:36
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Optionally install html docs, bug 426738 by Chris Mayo.
(Portage version: 2.2.0_alpha118/cvs/Linux x86_64)
Revision Changes Path
1.79 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.78&r2=1.79
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- grub-9999.ebuild 13 Jul 2012 18:05:19 -0000 1.78
+++ grub-9999.ebuild 18 Jul 2012 16:34:36 -0000 1.79
@@ -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.78 2012/07/13 18:05:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.79 2012/07/18 16:34:36 floppym Exp $
EAPI=4
@@ -30,7 +30,7 @@
LICENSE="GPL-3"
SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
+IUSE="custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs"
GRUB_PLATFORMS=(
# everywhere:
@@ -176,6 +176,7 @@
ECONF_SOURCE="${S}" \
econf \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--disable-werror \
--program-prefix= \
--program-transform-name="s,grub,grub2," \
@@ -202,10 +203,18 @@
pax-mark -mpes "${grub_binaries[@]}"
}
+grub_build_docs() {
+ emake -C docs html
+}
+
grub_src_install() {
default_src_install
}
+grub_install_docs() {
+ emake -C docs DESTDIR="${D}" install-html
+}
+
src_prepare() {
if [[ ${PV} != 9999 ]]; then
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
@@ -284,6 +293,9 @@
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
+
+ # Just build docs once
+ use doc && grub_run_phase build_docs ${i}
}
src_install() {
@@ -293,6 +305,8 @@
grub_run_phase ${FUNCNAME} ${i}
done
+ use doc && grub_run_phase install_docs ${i}
+
mv "${ED}"usr/share/info/grub{,2}.info || die
# can't be in docs array as we use default_src_install in different builddir
1.14 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.13&r2=1.14
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- grub-2.00.ebuild 13 Jul 2012 18:05:19 -0000 1.13
+++ grub-2.00.ebuild 18 Jul 2012 16:34:36 -0000 1.14
@@ -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.13 2012/07/13 18:05:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.14 2012/07/18 16:34:36 floppym Exp $
EAPI=4
@@ -30,7 +30,7 @@
LICENSE="GPL-3"
SLOT="2"
-IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
+IUSE="custom-cflags debug device-mapper doc efiemu mount nls static sdl truetype libzfs"
GRUB_PLATFORMS=(
# everywhere:
@@ -176,6 +176,7 @@
ECONF_SOURCE="${S}" \
econf \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
--disable-werror \
--program-prefix= \
--program-transform-name="s,grub,grub2," \
@@ -202,10 +203,18 @@
pax-mark -mpes "${grub_binaries[@]}"
}
+grub_build_docs() {
+ emake -C docs html
+}
+
grub_src_install() {
default_src_install
}
+grub_install_docs() {
+ emake -C docs DESTDIR="${D}" install-html
+}
+
src_prepare() {
if [[ ${PV} != 9999 ]]; then
epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
@@ -284,6 +293,9 @@
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
+
+ # Just build docs once
+ use doc && grub_run_phase build_docs ${i}
}
src_install() {
@@ -293,6 +305,8 @@
grub_run_phase ${FUNCNAME} ${i}
done
+ use doc && grub_run_phase install_docs ${i}
+
mv "${ED}"usr/share/info/grub{,2}.info || die
# can't be in docs array as we use default_src_install in different builddir
1.229 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.229&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.229&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.228&r2=1.229
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- ChangeLog 13 Jul 2012 18:05:19 -0000 1.228
+++ ChangeLog 18 Jul 2012 16:34:36 -0000 1.229
@@ -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.228 2012/07/13 18:05:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.229 2012/07/18 16:34:36 floppym Exp $
+
+ 18 Jul 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Optionally install html docs, bug 426738 by Chris Mayo.
13 Jul 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
grub-9999.ebuild:
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-07-13 18:05 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-07-13 18:05 UTC (permalink / raw
To: gentoo-commits
floppym 12/07/13 18:05:19
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Add mulitprocessing.eclass magic to src_configure.
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Revision Changes Path
1.78 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.77&r2=1.78
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- grub-9999.ebuild 7 Jul 2012 22:55:48 -0000 1.77
+++ grub-9999.ebuild 13 Jul 2012 18:05:19 -0000 1.78
@@ -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.77 2012/07/07 22:55:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.78 2012/07/13 18:05:19 floppym Exp $
EAPI=4
@@ -22,7 +22,7 @@
DO_AUTORECONF="true"
fi
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
+inherit eutils flag-o-matic multiprocessing pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
unset LIVE_ECLASS
DESCRIPTION="GNU GRUB boot loader"
@@ -253,9 +253,11 @@
# Sandbox bug 404013.
use libzfs && addpredict /etc/dfs:/dev/zfs
+ multijob_init
for i in ${GRUB_ENABLED_PLATFORMS}; do
- grub_run_phase ${FUNCNAME} ${i}
+ multijob_child_init grub_run_phase ${FUNCNAME} ${i}
done
+ multijob_finish || die
}
src_compile() {
1.13 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.12&r2=1.13
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- grub-2.00.ebuild 7 Jul 2012 22:55:48 -0000 1.12
+++ grub-2.00.ebuild 13 Jul 2012 18:05:19 -0000 1.13
@@ -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.12 2012/07/07 22:55:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.13 2012/07/13 18:05:19 floppym Exp $
EAPI=4
@@ -22,7 +22,7 @@
DO_AUTORECONF="true"
fi
-inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
+inherit eutils flag-o-matic multiprocessing pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
unset LIVE_ECLASS
DESCRIPTION="GNU GRUB boot loader"
@@ -253,9 +253,11 @@
# Sandbox bug 404013.
use libzfs && addpredict /etc/dfs:/dev/zfs
+ multijob_init
for i in ${GRUB_ENABLED_PLATFORMS}; do
- grub_run_phase ${FUNCNAME} ${i}
+ multijob_child_init grub_run_phase ${FUNCNAME} ${i}
done
+ multijob_finish || die
}
src_compile() {
1.228 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.228&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.228&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.227&r2=1.228
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- ChangeLog 7 Jul 2012 22:55:48 -0000 1.227
+++ ChangeLog 13 Jul 2012 18:05:19 -0000 1.228
@@ -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.227 2012/07/07 22:55:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.228 2012/07/13 18:05:19 floppym Exp $
+
+ 13 Jul 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Add mulitprocessing.eclass magic to src_configure.
07 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+files/grub-2.00-parallel-make.patch, -files/grub-2.00-manpage-race.patch,
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-07-07 22:55 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-07-07 22:55 UTC (permalink / raw
To: gentoo-commits
floppym 12/07/07 22:55:48
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Add additional fix for bug 424231.
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Revision Changes Path
1.77 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.76&r2=1.77
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- grub-9999.ebuild 1 Jul 2012 22:11:04 -0000 1.76
+++ grub-9999.ebuild 7 Jul 2012 22:55:48 -0000 1.77
@@ -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.76 2012/07/01 22:11:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.77 2012/07/07 22:55:48 floppym Exp $
EAPI=4
@@ -207,10 +207,9 @@
}
src_prepare() {
- local i j
-
if [[ ${PV} != 9999 ]]; then
- epatch "${FILESDIR}/${P}-manpage-race.patch"
+ epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
+ epatch "${FILESDIR}/${P}-no-gets.patch" #424703
fi
# fix texinfo file name, bug 416035
@@ -237,6 +236,7 @@
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
+ local i
for i in ${GRUB_PLATFORMS[@]}; do
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
1.12 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.11&r2=1.12
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grub-2.00.ebuild 5 Jul 2012 01:32:59 -0000 1.11
+++ grub-2.00.ebuild 7 Jul 2012 22:55:48 -0000 1.12
@@ -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.11 2012/07/05 01:32:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.12 2012/07/07 22:55:48 floppym Exp $
EAPI=4
@@ -207,10 +207,8 @@
}
src_prepare() {
- local i j
-
if [[ ${PV} != 9999 ]]; then
- epatch "${FILESDIR}/${P}-manpage-race.patch"
+ epatch "${FILESDIR}/${P}-parallel-make.patch" #424231
epatch "${FILESDIR}/${P}-no-gets.patch" #424703
fi
@@ -238,6 +236,7 @@
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
+ local i
for i in ${GRUB_PLATFORMS[@]}; do
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
1.227 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.227&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.227&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.226&r2=1.227
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- ChangeLog 5 Jul 2012 01:32:59 -0000 1.226
+++ ChangeLog 7 Jul 2012 22:55:48 -0000 1.227
@@ -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.226 2012/07/05 01:32:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.227 2012/07/07 22:55:48 floppym Exp $
+
+ 07 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+ +files/grub-2.00-parallel-make.patch, -files/grub-2.00-manpage-race.patch,
+ grub-2.00.ebuild, grub-9999.ebuild:
+ Add additional fix for bug 424231.
05 Jul 2012; Mike Frysinger <vapier@gentoo.org>
+files/grub-2.00-no-gets.patch, grub-2.00.ebuild:
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-07-01 22:11 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-07-01 22:11 UTC (permalink / raw
To: gentoo-commits
floppym 12/07/01 22:11:05
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Unset CCASFLAGS. Reported by tommy.
(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=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.75&r2=1.76
Index: grub-9999.ebuild
===================================================================
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 $
EAPI=4
@@ -209,7 +209,9 @@
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_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.
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=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.9&r2=1.10
Index: grub-2.00.ebuild
===================================================================
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 $
EAPI=4
@@ -209,7 +209,9 @@
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_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.
1.225 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.225&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.225&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.224&r2=1.225
Index: ChangeLog
===================================================================
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 <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,
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-06-29 22:06 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-06-29 22:06 UTC (permalink / raw
To: gentoo-commits
floppym 12/06/29 22:06:15
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Extend workaround for sandbox bug 404013.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Revision Changes Path
1.74 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.73&r2=1.74
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- grub-9999.ebuild 29 Jun 2012 15:34:20 -0000 1.73
+++ grub-9999.ebuild 29 Jun 2012 22:06:15 -0000 1.74
@@ -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.73 2012/06/29 15:34:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.74 2012/06/29 22:06:15 floppym Exp $
EAPI=4
@@ -242,9 +242,11 @@
local i
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use libzfs && addpredict /etc/dfs
use static && append-ldflags -static
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
1.8 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.7&r2=1.8
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grub-2.00.ebuild 29 Jun 2012 15:34:20 -0000 1.7
+++ grub-2.00.ebuild 29 Jun 2012 22:06:15 -0000 1.8
@@ -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.7 2012/06/29 15:34:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.8 2012/06/29 22:06:15 floppym Exp $
EAPI=4
@@ -242,9 +242,11 @@
local i
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use libzfs && addpredict /etc/dfs
use static && append-ldflags -static
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
for i in ${GRUB_ENABLED_PLATFORMS}; do
grub_run_phase ${FUNCNAME} ${i}
done
1.223 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.223&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.223&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.222&r2=1.223
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- ChangeLog 29 Jun 2012 16:21:21 -0000 1.222
+++ ChangeLog 29 Jun 2012 22:06:15 -0000 1.223
@@ -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.222 2012/06/29 16:21:21 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.223 2012/06/29 22:06:15 floppym Exp $
+
+ 29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Extend workaround for sandbox bug 404013.
29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-0.97-r12.ebuild:
grub-0.97 does not actually install files in /usr/lib, so don't copy that
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-06-29 15:34 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-06-29 15:34 UTC (permalink / raw
To: gentoo-commits
floppym 12/06/29 15:34:20
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Replace lzo with xz-utils, bug 424045 by Andrey Volkov.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Revision Changes Path
1.73 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.72&r2=1.73
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- grub-9999.ebuild 29 Jun 2012 03:10:31 -0000 1.72
+++ grub-9999.ebuild 29 Jun 2012 15:34:20 -0000 1.73
@@ -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.72 2012/06/29 03:10:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.73 2012/06/29 15:34:20 floppym Exp $
EAPI=4
@@ -17,7 +17,7 @@
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
mirror://gentoo/${MY_P}.tar.xz"
fi
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
fi
@@ -50,7 +50,7 @@
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
- dev-libs/lzo
+ app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5
debug? (
sdl? ( media-libs/libsdl )
1.7 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.6&r2=1.7
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grub-2.00.ebuild 29 Jun 2012 04:35:33 -0000 1.6
+++ grub-2.00.ebuild 29 Jun 2012 15:34:20 -0000 1.7
@@ -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.6 2012/06/29 04:35:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.7 2012/06/29 15:34:20 floppym Exp $
EAPI=4
@@ -50,7 +50,7 @@
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
- dev-libs/lzo
+ app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5
debug? (
sdl? ( media-libs/libsdl )
1.221 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.221&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.221&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.220&r2=1.221
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- ChangeLog 29 Jun 2012 04:35:33 -0000 1.220
+++ ChangeLog 29 Jun 2012 15:34:20 -0000 1.221
@@ -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.220 2012/06/29 04:35:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.221 2012/06/29 15:34:20 floppym Exp $
+
+ 29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Replace lzo with xz-utils, bug 424045 by Andrey Volkov.
29 Jun 2012; Jeff Horelick <jdhore@gentoo.org> grub-2.00.ebuild:
Keyword ~x86 wrt bug 424019
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-06-29 3:10 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-06-29 3:10 UTC (permalink / raw
To: gentoo-commits
floppym 12/06/29 03:10:31
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Add ~amd64 keyword for grub:2.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Revision Changes Path
1.72 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.71&r2=1.72
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- grub-9999.ebuild 29 Jun 2012 03:02:58 -0000 1.71
+++ grub-9999.ebuild 29 Jun 2012 03:10:31 -0000 1.72
@@ -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.71 2012/06/29 03:02:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.72 2012/06/29 03:10:31 floppym Exp $
EAPI=4
@@ -17,9 +17,7 @@
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
mirror://gentoo/${MY_P}.tar.xz"
fi
- # Masked until documentation guys consolidate the guide and approve
- # it for usage.
- #KEYWORDS="~amd64 ~mips ~x86"
+ KEYWORDS="~amd64"
S=${WORKDIR}/${MY_P}
fi
1.5 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.4&r2=1.5
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grub-2.00.ebuild 29 Jun 2012 03:02:58 -0000 1.4
+++ grub-2.00.ebuild 29 Jun 2012 03:10:31 -0000 1.5
@@ -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.4 2012/06/29 03:02:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.5 2012/06/29 03:10:31 floppym Exp $
EAPI=4
@@ -17,9 +17,7 @@
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
mirror://gentoo/${MY_P}.tar.xz"
fi
- # Masked until documentation guys consolidate the guide and approve
- # it for usage.
- #KEYWORDS="~amd64 ~mips ~x86"
+ KEYWORDS="~amd64"
S=${WORKDIR}/${MY_P}
fi
1.219 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.219&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.219&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.218&r2=1.219
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- ChangeLog 29 Jun 2012 03:02:58 -0000 1.218
+++ ChangeLog 29 Jun 2012 03:10:31 -0000 1.219
@@ -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.218 2012/06/29 03:02:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.219 2012/06/29 03:10:31 floppym Exp $
+
+ 29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Add ~amd64 keyword for grub:2.
29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
grub-9999.ebuild:
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-06-29 3:02 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-06-29 3:02 UTC (permalink / raw
To: gentoo-commits
floppym 12/06/29 03:02:58
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Add required use for qemu/truetype, bug 405741 by jlec.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Revision Changes Path
1.71 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.70&r2=1.71
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- grub-9999.ebuild 29 Jun 2012 02:51:54 -0000 1.70
+++ grub-9999.ebuild 29 Jun 2012 03:02:58 -0000 1.71
@@ -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.70 2012/06/29 02:51:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.71 2012/06/29 03:02:58 floppym Exp $
EAPI=4
@@ -47,6 +47,8 @@
)
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
+REQUIRED_USE="grub_platforms_qemu? ( truetype )"
+
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
1.4 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.3&r2=1.4
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grub-2.00.ebuild 29 Jun 2012 02:51:54 -0000 1.3
+++ grub-2.00.ebuild 29 Jun 2012 03:02:58 -0000 1.4
@@ -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.3 2012/06/29 02:51:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.4 2012/06/29 03:02:58 floppym Exp $
EAPI=4
@@ -47,6 +47,8 @@
)
IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
+REQUIRED_USE="grub_platforms_qemu? ( truetype )"
+
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
1.218 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.218&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.218&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.217&r2=1.218
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- ChangeLog 29 Jun 2012 02:51:54 -0000 1.217
+++ ChangeLog 29 Jun 2012 03:02:58 -0000 1.218
@@ -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.217 2012/06/29 02:51:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.218 2012/06/29 03:02:58 floppym Exp $
+
+ 29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Add required use for qemu/truetype, bug 405741 by jlec.
29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
grub-9999.ebuild:
^ permalink raw reply [flat|nested] 13+ messages in thread* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog
@ 2012-06-29 2:51 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-06-29 2:51 UTC (permalink / raw
To: gentoo-commits
floppym 12/06/29 02:51:54
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog
Log:
Depend on bison, bug 380019.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Revision Changes Path
1.70 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.69&r2=1.70
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- grub-9999.ebuild 28 Jun 2012 10:10:04 -0000 1.69
+++ grub-9999.ebuild 29 Jun 2012 02:51:54 -0000 1.70
@@ -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.69 2012/06/28 10:10:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.70 2012/06/29 02:51:54 floppym Exp $
EAPI=4
@@ -69,7 +69,7 @@
DEPEND="${RDEPEND}
>=dev-lang/python-2.5.2
sys-devel/flex
- virtual/yacc
+ sys-devel/bison
sys-apps/texinfo
static? (
truetype? (
@@ -301,4 +301,9 @@
if ! has_version dev-libs/libisoburn; then
elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
fi
+ if has_version sys-boot/grub:0; then
+ ewarn "If you want to keep GRUB Legacy (grub-0.97) installed, please run"
+ ewarn "the following to add sys-boot/grub:0 to your world file."
+ ewarn "emerge --noreplace sys-boot/grub:0"
+ fi
}
1.3 sys-boot/grub/grub-2.00.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.2&r2=1.3
Index: grub-2.00.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-2.00.ebuild 28 Jun 2012 14:54:59 -0000 1.2
+++ grub-2.00.ebuild 29 Jun 2012 02:51:54 -0000 1.3
@@ -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.2 2012/06/28 14:54:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.3 2012/06/29 02:51:54 floppym Exp $
EAPI=4
@@ -69,7 +69,7 @@
DEPEND="${RDEPEND}
>=dev-lang/python-2.5.2
sys-devel/flex
- virtual/yacc
+ sys-devel/bison
sys-apps/texinfo
static? (
truetype? (
1.217 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.217&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.217&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.216&r2=1.217
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- ChangeLog 28 Jun 2012 22:36:53 -0000 1.216
+++ ChangeLog 29 Jun 2012 02:51:54 -0000 1.217
@@ -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.216 2012/06/28 22:36:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.217 2012/06/29 02:51:54 floppym Exp $
+
+ 29 Jun 2012; Mike Gilbert <floppym@gentoo.org> grub-2.00.ebuild,
+ grub-9999.ebuild:
+ Depend on bison, bug 380019.
28 Jun 2012; Mike Gilbert <floppym@gentoo.org> files/grub.default-2:
Fix typos in grub.default, #424005 by Chris Mayo.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2012-10-11 2:14 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-01 21:31 [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-9999.ebuild grub-2.00.ebuild ChangeLog Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2012-10-11 2:14 Mike Gilbert (floppym)
2012-07-22 18:29 Mike Gilbert (floppym)
2012-07-22 16:43 Mike Gilbert (floppym)
2012-07-18 16:34 Mike Gilbert (floppym)
2012-07-13 18:05 Mike Gilbert (floppym)
2012-07-07 22:55 Mike Gilbert (floppym)
2012-07-01 22:11 Mike Gilbert (floppym)
2012-06-29 22:06 Mike Gilbert (floppym)
2012-06-29 15:34 Mike Gilbert (floppym)
2012-06-29 3:10 Mike Gilbert (floppym)
2012-06-29 3:02 Mike Gilbert (floppym)
2012-06-29 2:51 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox