Block grub-0.9x versions only #398451 by Duncan.

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

7 files changed, 24 insertions, 19 deletions

diff --git a/sys-boot/grub-static/ChangeLog b/sys-boot/grub-static/ChangeLog
index 42dbc22bf4d8..bd7b7a5a63d5 100644
--- a/sys-boot/grub-static/ChangeLog
+++ b/sys-boot/grub-static/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub-static
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.32 2012/06/02 06:38:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.33 2012/07/23 03:49:58 vapier Exp $
+
+  23 Jul 2012; Mike Frysinger <vapier@gentoo.org> grub-static-0.96-r1.ebuild,
+  grub-static-0.97-r10.ebuild, grub-static-0.97-r12.ebuild,
+  grub-static-0.97-r6.ebuild, grub-static-0.97-r9.ebuild,
+  grub-static-0.97.ebuild:
+  Block grub-0.9x versions only #398451 by Duncan.
 
 *grub-static-0.97-r12 (02 Jun 2012)
 
@@ -145,4 +151,3 @@
   26 Jul 2003; Olivier Crete <tester@gentoo.org>
   grub-static-0.93.20030118.ebuild:
   Initial version of grub static for amd64 since there is no 64-bit bootloader
-
diff --git a/sys-boot/grub-static/grub-static-0.96-r1.ebuild b/sys-boot/grub-static/grub-static-0.96-r1.ebuild
index c039df4bf0fd..a1e61101d564 100644
--- a/sys-boot/grub-static/grub-static-0.96-r1.ebuild
+++ b/sys-boot/grub-static/grub-static-0.96-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.96-r1.ebuild,v 1.4 2011/04/10 14:26:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.96-r1.ebuild,v 1.5 2012/07/23 03:49:58 vapier Exp $
 
 DESCRIPTION="Static GNU GRUB boot loader"
 
@@ -10,7 +10,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 ~x86"
 IUSE=""
-DEPEND="!sys-boot/grub"
+DEPEND="!<sys-boot/grub-2"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/sys-boot/grub-static/grub-static-0.97-r10.ebuild b/sys-boot/grub-static/grub-static-0.97-r10.ebuild
index afe0b09b9956..f493bc697d4c 100644
--- a/sys-boot/grub-static/grub-static-0.97-r10.ebuild
+++ b/sys-boot/grub-static/grub-static-0.97-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r10.ebuild,v 1.7 2011/04/10 14:26:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r10.ebuild,v 1.8 2012/07/23 03:49:58 vapier Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 ~x86"
 IUSE=""
-DEPEND="!sys-boot/grub"
+DEPEND="!<sys-boot/grub-2"
 RDEPEND="${DEPEND}"
 
 # These are already stripped since we use a binpkg.
diff --git a/sys-boot/grub-static/grub-static-0.97-r12.ebuild b/sys-boot/grub-static/grub-static-0.97-r12.ebuild
index 0424e87708ab..41881aff1646 100644
--- a/sys-boot/grub-static/grub-static-0.97-r12.ebuild
+++ b/sys-boot/grub-static/grub-static-0.97-r12.ebuild
@@ -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-static/grub-static-0.97-r12.ebuild,v 1.1 2012/06/02 06:38:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r12.ebuild,v 1.2 2012/07/23 03:49:58 vapier Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
-DEPEND="!sys-boot/grub"
+DEPEND="!<sys-boot/grub-2"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}
diff --git a/sys-boot/grub-static/grub-static-0.97-r6.ebuild b/sys-boot/grub-static/grub-static-0.97-r6.ebuild
index 1fe422192a09..e8f2d7ea1f16 100644
--- a/sys-boot/grub-static/grub-static-0.97-r6.ebuild
+++ b/sys-boot/grub-static/grub-static-0.97-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r6.ebuild,v 1.6 2011/04/10 14:26:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r6.ebuild,v 1.7 2012/07/23 03:49:58 vapier Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 ~x86"
 IUSE=""
-DEPEND="!sys-boot/grub"
+DEPEND="!<sys-boot/grub-2"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/sys-boot/grub-static/grub-static-0.97-r9.ebuild b/sys-boot/grub-static/grub-static-0.97-r9.ebuild
index 0b1fe90b0dbc..e64f37458a9a 100644
--- a/sys-boot/grub-static/grub-static-0.97-r9.ebuild
+++ b/sys-boot/grub-static/grub-static-0.97-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.11 2011/04/10 14:26:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.12 2012/07/23 03:49:58 vapier Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
 IUSE=""
-DEPEND="!sys-boot/grub"
+DEPEND="!<sys-boot/grub-2"
 RDEPEND="${DEPEND}"
 
 # These are already stripped since we use a binpkg.
diff --git a/sys-boot/grub-static/grub-static-0.97.ebuild b/sys-boot/grub-static/grub-static-0.97.ebuild
index f2cb3625f372..3a689a15a6bc 100644
--- a/sys-boot/grub-static/grub-static-0.97.ebuild
+++ b/sys-boot/grub-static/grub-static-0.97.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild,v 1.7 2011/04/10 14:26:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild,v 1.8 2012/07/23 03:49:58 vapier Exp $
 
 inherit mount-boot
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* amd64 ~x86"
 IUSE=""
-DEPEND="!sys-boot/grub"
+DEPEND="!<sys-boot/grub-2"
 RDEPEND="${DEPEND}"
 
 src_install() {