diff options
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 20 |
2 files changed, 14 insertions, 12 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 8bcf7b95f6d6..739fa3a26b46 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.154 2011/04/10 14:34:42 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.155 2011/05/29 17:25:05 vapier Exp $ + + 29 May 2011; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild: + Convert to EAPI=2 and do not run `set -e` with eautoreconf #369093 by Zachary + Bedell. 10 Apr 2011; Ulrich Mueller <ulm@gentoo.org> grub-0.92-r1.ebuild, grub-0.94-r1.ebuild, grub-0.96-r1.ebuild, grub-0.96-r2.ebuild, diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 76218eaf0036..40b4b5997ff7 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2011 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.32 2011/04/03 18:18:12 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.33 2011/05/29 17:25:05 vapier Exp $ # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch +EAPI="2" inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -37,24 +38,18 @@ DEPEND="${RDEPEND} export STRIP_MASK="*/grub/*/*.mod" QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest" -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - bzr_src_unpack - else - unpack ${A} - fi - cd "${S}" +src_prepare() { epatch_user # autogen.sh does more than just run autotools # need to eautomake due to weirdness #296013 if [[ ${PV} == "9999" ]] ; then - sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die + sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die (. ./autogen.sh) || die fi } -src_compile() { +src_configure() { use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS use static && append-ldflags -static @@ -69,7 +64,10 @@ src_compile() { $(use_enable debug mm-debug) \ $(use sdl && use_enable debug grub-emu-sdl) \ $(use_enable debug grub-emu-usb) - emake -j1 || die "making regular stuff" +} + +src_compile() { + emake -j1 || die } src_install() { |