[gentoo-commits] gentoo-x86 commit in sys-boot/grub: ChangeLog grub-9999.ebuild

[Mike Frysinger (vapier)]

vapier      11/05/29 17:25:05

  Modified:             ChangeLog grub-9999.ebuild
  Log:
  Convert to EAPI=2 and do not run `set -e` with eautoreconf #369093 by Zachary Bedell.
  
  (Portage version: 2.2.0_alpha33/cvs/Linux x86_64)

Revision  Changes    Path
1.155                sys-boot/grub/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.154&r2=1.155

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- ChangeLog	10 Apr 2011 14:34:42 -0000	1.154
+++ ChangeLog	29 May 2011 17:25:05 -0000	1.155
@@ -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@g.o> 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@g.o> grub-0.92-r1.ebuild,
   grub-0.94-r1.ebuild, grub-0.96-r1.ebuild, grub-0.96-r2.ebuild,



1.33                 sys-boot/grub/grub-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.32&r2=1.33

Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- grub-9999.ebuild	3 Apr 2011 18:18:12 -0000	1.32
+++ grub-9999.ebuild	29 May 2011 17:25:05 -0000	1.33
@@ -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 @@
 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 @@
 		$(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() {