public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger (vapier)" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-boot/grub: ChangeLog grub-9999.ebuild grub-1.97.1.ebuild
Date: Sun, 17 Jan 2010 01:25:28 +0000	[thread overview]
Message-ID: <E1NWJtQ-0001j7-Jh@stork.gentoo.org> (raw)

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
 }






             reply	other threads:[~2010-01-17  1:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-17  1:25 Mike Frysinger (vapier) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-01-10  6:13 [gentoo-commits] gentoo-x86 commit in sys-boot/grub: ChangeLog grub-9999.ebuild grub-1.97.1.ebuild Mike Frysinger (vapier)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1NWJtQ-0001j7-Jh@stork.gentoo.org \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox