* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: ChangeLog grub-9999.ebuild grub-1.97.1.ebuild
@ 2010-01-10 6:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2010-01-10 6:13 UTC (permalink / raw
To: gentoo-commits
vapier 10/01/10 06:13:22
Modified: ChangeLog grub-9999.ebuild grub-1.97.1.ebuild
Log:
Only build grub-mkfont when USE=truetype #275654 by Cameron Tacklind.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Revision Changes Path
1.129 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.128&r2=1.129
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- ChangeLog 22 Nov 2009 17:34:52 -0000 1.128
+++ ChangeLog 10 Jan 2010 06:13:21 -0000 1.129
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.128 2009/11/22 17:34:52 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.129 2010/01/10 06:13:21 vapier Exp $
+
+ 10 Jan 2010; Mike Frysinger <vapier@gentoo.org> grub-1.97.1.ebuild,
+ grub-9999.ebuild:
+ Only build grub-mkfont when USE=truetype #275654 by Cameron Tacklind.
22 Nov 2009; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
Switch from svn to bzr repo #294001 by Robin Kauffman.
1.18 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.17&r2=1.18
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- grub-9999.ebuild 10 Jan 2010 06:09:56 -0000 1.17
+++ grub-9999.ebuild 10 Jan 2010 06:13:21 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.17 2010/01/10 06:09:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.18 2010/01/10 06:13:21 vapier Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs
@@ -19,10 +19,11 @@
LICENSE="GPL-3"
use multislot && SLOT="2" || SLOT="0"
KEYWORDS=""
-IUSE="custom-cflags debug multislot static"
+IUSE="custom-cflags debug truetype multislot static"
RDEPEND=">=sys-libs/ncurses-5.2-r5
- dev-libs/lzo"
+ dev-libs/lzo
+ truetype? ( media-libs/freetype )"
DEPEND="${RDEPEND}
dev-lang/ruby"
PROVIDE="virtual/bootloader"
@@ -57,7 +58,7 @@
--bindir=/bin \
--libdir=/$(get_libdir) \
--disable-efiemu \
- --enable-grub-mkfont \
+ $(use_enable truetype grub-mkfont) \
$(use_enable debug mm-debug) \
$(use_enable debug grub-emu) \
$(use_enable debug grub-emu-usb) \
1.3 sys-boot/grub/grub-1.97.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild?r1=1.2&r2=1.3
Index: grub-1.97.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-1.97.1.ebuild 10 Jan 2010 06:09:56 -0000 1.2
+++ grub-1.97.1.ebuild 10 Jan 2010 06:13:21 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v 1.2 2010/01/10 06:09:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v 1.3 2010/01/10 06:13:21 vapier Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs
@@ -19,10 +19,11 @@
LICENSE="GPL-3"
use multislot && SLOT="2" || SLOT="0"
KEYWORDS=""
-IUSE="custom-cflags debug multislot static"
+IUSE="custom-cflags debug truetype multislot static"
RDEPEND=">=sys-libs/ncurses-5.2-r5
- dev-libs/lzo"
+ dev-libs/lzo
+ truetype? ( media-libs/freetype )"
DEPEND="${RDEPEND}
dev-lang/ruby"
PROVIDE="virtual/bootloader"
@@ -57,7 +58,7 @@
--bindir=/bin \
--libdir=/$(get_libdir) \
--disable-efiemu \
- --enable-grub-mkfont \
+ $(use_enable truetype grub-mkfont) \
$(use_enable debug mm-debug) \
$(use_enable debug grub-emu) \
$(use_enable debug grub-emu-usb) \
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: ChangeLog grub-9999.ebuild grub-1.97.1.ebuild
@ 2010-01-17 1:25 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2010-01-17 1:25 UTC (permalink / raw
To: gentoo-commits
vapier 10/01/17 01:25:28
Modified: ChangeLog grub-9999.ebuild grub-1.97.1.ebuild
Log:
Workaround eautomake weirdness #296013.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Revision Changes Path
1.131 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.130&r2=1.131
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- ChangeLog 17 Jan 2010 01:24:17 -0000 1.130
+++ ChangeLog 17 Jan 2010 01:25:28 -0000 1.131
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.130 2010/01/17 01:24:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.131 2010/01/17 01:25:28 vapier Exp $
+
+ 17 Jan 2010; Mike Frysinger <vapier@gentoo.org> grub-1.97.1.ebuild,
+ grub-9999.ebuild:
+ Workaround eautomake weirdness #296013.
17 Jan 2010; Mike Frysinger <vapier@gentoo.org>
files/grub-1.96-genkernel.patch:
1.19 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.18&r2=1.19
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- grub-9999.ebuild 10 Jan 2010 06:13:21 -0000 1.18
+++ grub-9999.ebuild 17 Jan 2010 01:25:28 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.18 2010/01/10 06:13:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.19 2010/01/17 01:25:28 vapier Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs
@@ -42,8 +42,12 @@
epatch_user
# autogen.sh does more than just run autotools
+ # need to eautomake due to weirdness #296013
if [[ ${PV} == "9999" ]] ; then
- sed -i -e '/^\(auto\|ac\)/s:^:e:' autogen.sh
+ sed -i \
+ -e '/^\(auto\|ac\)/s:^:e:' \
+ -e "s:^eautomake:`which automake`:" \
+ autogen.sh
(. ./autogen.sh) || die
fi
}
1.4 sys-boot/grub/grub-1.97.1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild?r1=1.3&r2=1.4
Index: grub-1.97.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grub-1.97.1.ebuild 10 Jan 2010 06:13:21 -0000 1.3
+++ grub-1.97.1.ebuild 17 Jan 2010 01:25:28 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v 1.3 2010/01/10 06:13:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v 1.4 2010/01/17 01:25:28 vapier Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs
@@ -42,8 +42,12 @@
epatch_user
# autogen.sh does more than just run autotools
+ # need to eautomake due to weirdness #296013
if [[ ${PV} == "9999" ]] ; then
- sed -i -e 's:^auto:eauto:' autogen.sh
+ sed -i \
+ -e '/^\(auto\|ac\)/s:^:e:' \
+ -e "s:^eautomake:`which automake`:" \
+ autogen.sh
(. ./autogen.sh) || die
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-17 1:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-17 1:25 [gentoo-commits] gentoo-x86 commit in sys-boot/grub: ChangeLog grub-9999.ebuild grub-1.97.1.ebuild Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2010-01-10 6:13 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox