summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-07-23 03:49:58 +0000
committerMike Frysinger <vapier@gentoo.org>2012-07-23 03:49:58 +0000
commite2d3e06d28c53707dde9ba9b5edf1dd664e6b6b6 (patch)
tree2c1f16b08e4bcee0f612462b5e14f79a00f9366a /sys-boot
parentGrab some fixes from upstream for ia64 #425736 by Tim Yamin. (diff)
downloadhistorical-e2d3e06d28c53707dde9ba9b5edf1dd664e6b6b6.tar.gz
historical-e2d3e06d28c53707dde9ba9b5edf1dd664e6b6b6.tar.bz2
historical-e2d3e06d28c53707dde9ba9b5edf1dd664e6b6b6.zip
Block grub-0.9x versions only #398451 by Duncan.
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub-static/ChangeLog9
-rw-r--r--sys-boot/grub-static/Manifest54
-rw-r--r--sys-boot/grub-static/grub-static-0.96-r1.ebuild6
-rw-r--r--sys-boot/grub-static/grub-static-0.97-r10.ebuild6
-rw-r--r--sys-boot/grub-static/grub-static-0.97-r12.ebuild4
-rw-r--r--sys-boot/grub-static/grub-static-0.97-r6.ebuild6
-rw-r--r--sys-boot/grub-static/grub-static-0.97-r9.ebuild6
-rw-r--r--sys-boot/grub-static/grub-static-0.97.ebuild6
8 files changed, 51 insertions, 46 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/Manifest b/sys-boot/grub-static/Manifest
index 2abfa592ac8f..2e2878b545bd 100644
--- a/sys-boot/grub-static/Manifest
+++ b/sys-boot/grub-static/Manifest
@@ -1,34 +1,34 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-DIST grub-static-0.96.tar.bz2 859179 RMD160 799759e6e4771527e5daf6dfbe7de647482229d4 SHA1 e334fe0429b215ce726b0c42c5ca12e13c858157 SHA256 3ece8910e7954ca2c2cbebc4d05cfb22e73455f826508661a5b1a60481dcbd76
-DIST grub-static-0.97-r10.tar.bz2 888963 RMD160 0c66b849f5e6d88471d5334d7e906a29cc45ef0b SHA1 1a0d9e1a18ccb74059aa9136114a958cbfb03a08 SHA256 812c8113efa13b6bfe254e866204b4763bf889c796835ed0b53cb64920428d82
-DIST grub-static-0.97-r12.tar.bz2 1171586 RMD160 5f44f265c9a9559522dab62759ab55495d69a20d SHA1 cf621b424a8c1df5f53abbf1e4b4871da7e94a4e SHA256 865eb5b3131d30be7ddbbc6969e924f2d199353c076504a2668a8df5be17c51f
-DIST grub-static-0.97-r6.tar.bz2 1005650 RMD160 ed651f766ba1adfd98a5cd4cd1e7e3fd886fd785 SHA1 67b004a4411a02963a90b8e40755d3987421675e SHA256 1a17a8df6839401f7d1829aebea45c1654c3fcdd6a6f068100126d2fcbe75698
-DIST grub-static-0.97-r9.tar.bz2 937621 RMD160 d8cab235213050b5731d36097480f9f4136a34dc SHA1 fcad772b132feb1ee47771c790f83de4a4f291c8 SHA256 0d6af53c5380bd37ea67f314236364baebfff52762ea5e52bf2f66941dabe2d1
-DIST grub-static-0.97.tar.bz2 954051 RMD160 3b4d3951df5ab0255321631dd383803bb2302977 SHA1 aaddbe5f31788cd6e46a0e76219b76ae14ac062a SHA256 468ac48823880bd7cb2dd6bf60673adef1313c44a5e3131a0a4a37d2cc1145bc
-EBUILD grub-static-0.96-r1.ebuild 518 RMD160 215afd3ae79ae7bd06f073c0bfa1f4d0c02ef222 SHA1 858515b86f676262a4402b0948e82ca5cb6f5ec3 SHA256 1b3b3b7e9d8f84022e381105e6c7d3bfaac653ff37e552c9093364974180ef17
-EBUILD grub-static-0.97-r10.ebuild 5509 RMD160 fd648805115ea07f5e8b3439d7d77ed8b7498feb SHA1 61dc657fc55886593e264c77e0429642df54e15b SHA256 9f540e2fb370dd6900ac946cb873471c59190d3316d523844175c1c1b33228b4
-EBUILD grub-static-0.97-r12.ebuild 5513 RMD160 174d1d36536ace733f3e4b858b58c2912516a680 SHA1 5370d00fd6955eaea7907f8cee0631c577ba0a50 SHA256 b1dfd8874bfdea3f26ca181cd7b86541aac63f34e88f7ee3e1ff710f3e947be1
-EBUILD grub-static-0.97-r6.ebuild 4438 RMD160 98e99122aa2aecbf2a213a9263a2d55a0504a3b4 SHA1 3e2bc2e17da27e2f30e0d53aae6821425287b880 SHA256 6dae62fea151ede6cbd32be6e474cf253059b06a60e76f42a088367d2d30bdd8
-EBUILD grub-static-0.97-r9.ebuild 5404 RMD160 1b6253b8f1a8381868dffd29b5bee2b0491fa39b SHA1 55655233ce9fa9015864d7f378c704bde81d786f SHA256 5fdc6ffee2aa92ece409ad74b1deb40c3e2773b77e66cf260b65d4905468e7c2
-EBUILD grub-static-0.97.ebuild 2029 RMD160 a8e49fd10c25c53ea7424b182afffdb146357271 SHA1 99b55b9c2b3d9dd53757e8397da440f47d7da522 SHA256 c3565705ceac58e111d4d7e4256c4aee281fdb8522b4fc0318c72e72d211726c
-MISC ChangeLog 5165 RMD160 afb5ae954ec4d906a18b15b6d718732ae9ce0b47 SHA1 2c9ce66d276af9f1dcb13663b8b5d7b3a2f4ed40 SHA256 a4fcfb95c5b9d273dae09694250ca01b6eb34eee22f998624a3ed2fb68f09bec
-MISC metadata.xml 158 RMD160 d823c6f24034325d607a095ce2851034d70fd2f2 SHA1 7e7b3c2aedeb5fa2761c27cf8f56b5240ae9678e SHA256 0df9eb61f6a4e4a3f8fc16386b0204e22e85940533d769d4a0418a4ecec50d90
+DIST grub-static-0.96.tar.bz2 859179 SHA256 3ece8910e7954ca2c2cbebc4d05cfb22e73455f826508661a5b1a60481dcbd76
+DIST grub-static-0.97-r10.tar.bz2 888963 SHA256 812c8113efa13b6bfe254e866204b4763bf889c796835ed0b53cb64920428d82
+DIST grub-static-0.97-r12.tar.bz2 1171586 SHA256 865eb5b3131d30be7ddbbc6969e924f2d199353c076504a2668a8df5be17c51f SHA512 0a4c0b3b556db366df70c7c51a1a26f614f949be4002d7f9a053b7261b80c2c49410e8fd04c7e3717ea560e7cbc6a692d859d07bdfe2099a78a33bce78ac5395 WHIRLPOOL c6e05b297d8cf8c6d84495a122502740d2102c32f14bd2df8b80c9e43a91c7f58f50297dbd4e2ba70fe7aee44a0f06bfff94e597fbddc65fa5b93efd4c2e9fea
+DIST grub-static-0.97-r6.tar.bz2 1005650 SHA256 1a17a8df6839401f7d1829aebea45c1654c3fcdd6a6f068100126d2fcbe75698
+DIST grub-static-0.97-r9.tar.bz2 937621 SHA256 0d6af53c5380bd37ea67f314236364baebfff52762ea5e52bf2f66941dabe2d1
+DIST grub-static-0.97.tar.bz2 954051 SHA256 468ac48823880bd7cb2dd6bf60673adef1313c44a5e3131a0a4a37d2cc1145bc
+EBUILD grub-static-0.96-r1.ebuild 524 SHA256 c76bc5b61da0e916e9ed8241cd8261ab2450f0ba114a6f5f47c070a4488257ce SHA512 c3cff2018b4bf5a6b86aa8ce2248cc3464301aa093f6d272057ce8ad1b023c25e2d7be12dbbf934c8e35d723fad30ef9aa9fdf66035a2e2bd503e0f6e76ded55 WHIRLPOOL cf814bf5e7ba99b7dc1238969179f5c761649a2230ee90b46d9fbe5067a7ace0794c0f7649b813e25f09f38b3731c9cfdbdee30176abf551e6ce5407f90b9a11
+EBUILD grub-static-0.97-r10.ebuild 5515 SHA256 4b33ef5aade9667391a8d677afe41358249adef6fdf29e1084e327471ee20dc0 SHA512 8a890fb67dacfdebecb0a67fc9a4f16e63bfb71e8a9f526e34ee9b4ec440c0c9b36edfd40fa26c851c348f39a5a5f4d31b02a8aa28dfdd30288cc7c4658367f6 WHIRLPOOL f9b6396984ef10c268cf51850c390937ea4168612ec23bfa989c1da3a885cd6ded3a6c5702a06ac1a8664108e966fbd081be647fbdbdacc6eca8d953832fe297
+EBUILD grub-static-0.97-r12.ebuild 5516 SHA256 eba2f9f2a18f57675a6dd694a6dc7d1a80a1d6d05e42120ce761631c8e001c06 SHA512 39ff3ef2d86122fa7138e1feb928ffb3090805ec1e9078b6bc135cbb2ef64ff260f2de9581e10ed027e33ede390ea4c86c9a8da2771d147997842b07ca034c22 WHIRLPOOL 7ebde3c91005d99a81f6e1757b3e0e3e899e87499c5be5dc1f4f8fff08191af25848ac4821e65cb9bf791212b1b3b020815335c27dbb2f80e2442fda0b488da1
+EBUILD grub-static-0.97-r6.ebuild 4444 SHA256 bcf845e0eaa788351719569b11eaaddf9c058e41abed2745f756f6fbb653be42 SHA512 ce44b4175ca7f1d5f23a8a2e5d67b549a9f2829cbba569c97ccd740d2401d5a1835ae590d84245e0b6319b5a66f0cfe4d71b82b77953e4bdb7878f077db7a5b1 WHIRLPOOL 3e5a4ac3aefb5ec8527538115b59aa2af2c745fcb94fb451622e22949d146c0d9eee8ea33a5feea3feb83458c06348290a061d6321aeba5ecc469b5a91dcd5b4
+EBUILD grub-static-0.97-r9.ebuild 5410 SHA256 81967d1bfd6571ffbc3081b70fd83da1a36a8a86152b2eca88a746ce09c21919 SHA512 b0f5b784d85f2e45d19bf2a734f9873d8e9378b0d644544b2bf4c6dc8a019c90b76f0484758418b4763229065a290aa988a5ce164e2b5ab6e9f28807bdb8bbb9 WHIRLPOOL 34fb3114fabdb61d36d24f946f93fa27db0afdbec0f3cbabc922f22dc19cebc08a67d1eadc685d213c5081616324e4c3cde7ccd3495abba82ad350c84d6cf83b
+EBUILD grub-static-0.97.ebuild 2035 SHA256 d62c1a79d01ac284eec13d604b827d663966945c5d3209b0cf0358beb9e96e9e SHA512 9b4a940f84b6bf09f8b6404cb1c63bc84830f45610b25fdc58927038bc711b1a1e1602561eeb9bee4a36ca47f5b9f1cf92b1de0c276e242aebef5056641c7c02 WHIRLPOOL 8c7750e5c5cfdc939034651095d545214f28b205c08800ee4c15f37d3c2d30315ea2917b51c9d9bb38920755f94bc45fd35fb2c6bfe7c0d156b585d19c143f87
+MISC ChangeLog 5439 SHA256 06583c80f977ab8f4950fbee5332282498739bea3988d972752fcd7370d3a416 SHA512 d3214ad9cdd8c755ce5484c30eee2335923a1a90a2423b54a384eeabea233649b23000d06e6dd1af7fdb1593fa1e0d7d13e07731097e0b78090311c04652001d WHIRLPOOL 9e939a0413ee494604762b52b6c177b1d707f36624c00d71affc86e97097d37dd1897f911e283ee664a3738e99e325a492065d3297ee433cb2adb1955cead74b
+MISC metadata.xml 158 SHA256 0df9eb61f6a4e4a3f8fc16386b0204e22e85940533d769d4a0418a4ecec50d90 SHA512 e59c9f002f414c281cb69001ab64a9f772689b4accb0cc9173d94d2164be3c38c72ce6e36c2b522442a3de954cf88d6f2b6fb74bdfe9e2e2735e78c9c583283e WHIRLPOOL aaab4e99a3175a7ccbd5ee673a7646f1a32ff56b1670bde20322f827caaf63e4993ea9ab9c7fd1ca2fd89b06dd4b68b0956ab40515d6fcb5ec6f484621085a44
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBAgAGBQJPybUMAAoJELEHsLL7fEFWLicQAIYddfp4xJIoNfG8RTlamH1+
-ZPdNHvywEvY1Jw5QzCBCP9lOWZ68Qg4pAZ+5u5PKBcZrc9Z1YmLDAVFHZI0hdXLm
-nBwn+YFwwcAjJzNOtR/Z/6rV/JZmffgoemHiZkjJXw56o5VpnKi5vO1P6RZ8fAa4
-qJdjzNkscsBXavQdQ/6W0RJiZGHZS4Y3MEKRQ5RP0PIE/TuU4541LWpl7s12goWC
-gctuRQTbi7mqoVy8Td3M5K1rSS0pSRlUx+QTKEfIgd8V9wHjdfK5tBfNe0s+ym0y
-QZJpmNQ0LSpRXRQG9AQxy6U+BxUaKLh7MNezZS/6r0G0GoYMVWwwD5YjSNcJlsrR
-3C+mOt46TefTkgYUJti9t7WAcpqhOppIo3I4jqXqwxVJFkgJtNKVwS7FcCc7L90Q
-Ezsw1O/Q7ashGZ4oMCQittXZ2CZowE76Bm5krJFfk9epOLJxitxMWv1iIIbiiCJo
-b+c+brycJ042kWPyDdO1l5I6FqS7FgccujfNdzb9rKlIhQmx5aTl2vypCKROXvnW
-rqJvvUrQ+wLWqalow3sq0nDg0nyAdiP69ZZBlkRjeFZzFEX9ZziFEPKFWnjnbg8/
-YQl/SUPRKT7Hv4hzVn+Ohf6vPiFMLK13WNDQmxavMiPRhBzCcRD0E9VzgkT7osZt
-2wlIG0HYw95BYt0JMrdb
-=w62D
+iQIcBAEBAgAGBQJQDMojAAoJELEHsLL7fEFWHzIQAMBhEyViiSoDNBoJIDdr1YvQ
+U6BfMYQNItBlXDsniTPfbjqWo3u1JNSL9dvxYpO1ZLTQ3vklvTwcQpFtEkj5assQ
+k7VK8a5hHLjWlPV/i4E0BG2ZuVyNpbagDE9FfAPhLgBuGfy6sfHXz9QwUCWlUAd9
+MkLdyI51uAFD+4c4Mzz/GoNK4pPSSH/D/jMF+QFHdil1TOaMP1Tx1VrROF2qf7cl
+TPGgzqbNUaRbX6+yiM63BnVCZmtHMGy0i67+UzOp4gq5ouMrPCNO4ZxIT0U+dwwo
+DpBPfvBlnB/LiCaakzJoIac+0r8VeDQ5lrpauBNJzFnA+WAFMw72F40Hl3AVtK2O
+1wMESyjvk7m/WokIXqZovLZ7ulG6IOBJX4RDADkdWyRx0QYbN3tyfeyq+vkCcFU1
+de6anjQLkB8jvq8aLaqnNWoCC8RyrYIw+JiHp/sB/X9DA36XyY5FpT4+NsOYhYR0
+obX3H3wjxKJhocwg0YctI46QvLlm84vWt3Pb2V7aIA10WocWJu8hZi6Br0e/Pfq7
+0laJ+xBC3jVu0CV1dORRYwvtivTM6JU8TwJkxJ2Hl68LVnm+Z2rSILZpHiRVtDK+
+pjLOGkZ3iQeRWuylpYDTQcQiyBdPtcE6S9wyQVXMuKGAOJWvxuVl1K1PawC0j628
+al+RQxNcBss4imUjWmky
+=cSHt
-----END PGP SIGNATURE-----
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() {