summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-09-02 21:19:37 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-09-02 21:19:37 +0000
commit2ccb06bba13de257248f75ec2b166ba4043590cb (patch)
tree1df7ee8dcef453d8ad6fec6802afe220abb30fef /sys-boot/grub
parentBug #330745: Grub needs executable stack. No version bump yet, new revbump wi... (diff)
downloadhistorical-2ccb06bba13de257248f75ec2b166ba4043590cb.tar.gz
historical-2ccb06bba13de257248f75ec2b166ba4043590cb.tar.bz2
historical-2ccb06bba13de257248f75ec2b166ba4043590cb.zip
Fix RDEPEND.
Package-Manager: portage-2.2_rc71/cvs/Linux x86_64
Diffstat (limited to 'sys-boot/grub')
-rw-r--r--sys-boot/grub/ChangeLog5
-rw-r--r--sys-boot/grub/Manifest4
-rw-r--r--sys-boot/grub/grub-0.97-r10.ebuild7
3 files changed, 10 insertions, 6 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 21b7610565ba..758b0a0bd09b 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
# 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.144 2010/09/02 21:18:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.145 2010/09/02 21:19:37 robbat2 Exp $
+
+ 02 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r10.ebuild:
+ Fix RDEPEND.
02 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r10.ebuild:
Bug #330745: Grub needs executable stack. No version bump yet, new revbump
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 4760fbedc183..b2a0ffc3d6fc 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -25,7 +25,7 @@ EBUILD grub-0.94-r1.ebuild 3533 RMD160 d8c0867e559d32f667257436a82739cf76f7692a
EBUILD grub-0.96-r1.ebuild 4747 RMD160 1fbaf2c1e712baf3cd7124b6e9ba58ba63ce631a SHA1 3e877e57f4a7618c7a3ebe374fa9f5ae39aae3f4 SHA256 a000bb83287a7d46a5637b60e477d8fedbf8c2b465074edf1ba3b21bca95a374
EBUILD grub-0.96-r2.ebuild 4349 RMD160 8b59e7b7bcf02f6e6698bf785950988c71907e26 SHA1 5f068f5fcfd05a7769814d6fae868f77dea2ccf9 SHA256 cbaae5c519231d853e28e9a2799b08544e8b2a97c93d1905a21244d385b0e20c
EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b SHA1 2d7dd82a379afd847be5b129a090bb1e954ffd71 SHA256 2278f36b971d091471f39acd68902edf5e54fc88bc2d417e033fbf8128159e13
-EBUILD grub-0.97-r10.ebuild 9041 RMD160 222c0b84a3bd18b8f7fb26e7d543b607e569065d SHA1 1fddadda0e300f76dee11219159d235637196957 SHA256 61c67e65c657b621a265b02f4f6b90e2340d55427881c8528e4955f26908deae
+EBUILD grub-0.97-r10.ebuild 9061 RMD160 d3a038a4502cdcb5d7995aae04d777a3bbc29403 SHA1 f7e244ac56722faffcade95b9d1c6486a7b96b8f SHA256 4831940f106c4a6905323a350e6395b616362a994596a4407863bc9897a5dc30
EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429
EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9
EBUILD grub-0.97-r4.ebuild 4967 RMD160 a24281663a2b5ca3452a044f18dcd1a231870812 SHA1 01cecc3f8505585fc28519ead7d524c3ace778b5 SHA256 1c40a3df3ba6b09ecce9f9d4bc934d342e23d19c5fc1c5eccda589e219bf6e8e
@@ -36,5 +36,5 @@ EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0
EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
EBUILD grub-1.98.ebuild 2966 RMD160 63d5199e13c846ccc2a257ed66660c60859e40fa SHA1 0eaf688ac4eae081564d9a45cc7f55462c40bf32 SHA256 347de9c95cbf56754fccc6f47f340245bf15b630a4992ffe1f15ddb9fe71f004
EBUILD grub-9999.ebuild 2994 RMD160 4b20e1e5ee4aa3df18a39e5c6bc1c19d1df88e0a SHA1 e4b823c306b84defe48a22b5d0601e7e150f916a SHA256 90317b69b81814be4a07f1a127e2c0dd3ff2c4eb560817259e9a97c306fe0b02
-MISC ChangeLog 29879 RMD160 ef45b25d2fea1c854140a0b14256777d2345de63 SHA1 20e32749ebff3d424ce69f5976094c69930fcc3c SHA256 8b92fee98f8d90d19e5cc9bd30f286853de6b1af90660efbb7903db0cded5c2a
+MISC ChangeLog 29970 RMD160 e827f261801717008a816288e0825dab99fadaa2 SHA1 e356694957db84521fb77181637c3f57deda37de SHA256 233b76e02f2fc2cf0db98cb57f8aaf3adf42af589420e794d85bf2777437bc52
MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
diff --git a/sys-boot/grub/grub-0.97-r10.ebuild b/sys-boot/grub/grub-0.97-r10.ebuild
index b07369ca9aea..b79a43c6d711 100644
--- a/sys-boot/grub/grub-0.97-r10.ebuild
+++ b/sys-boot/grub/grub-0.97-r10.ebuild
@@ -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-0.97-r10.ebuild,v 1.5 2010/09/02 21:18:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.6 2010/09/02 21:19:37 robbat2 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
@@ -22,10 +22,11 @@ SLOT="0"
KEYWORDS="amd64 x86 ~x86-fbsd"
IUSE="custom-cflags ncurses netboot static"
-DEPEND="ncurses? (
+RDEPEND="ncurses? (
>=sys-libs/ncurses-5.2-r5
amd64? ( app-emulation/emul-linux-x86-baselibs )
)"
+DEPEND="${RDEPEND}"
PROVIDE="virtual/bootloader"
pkg_setup() {
@@ -157,7 +158,7 @@ src_install() {
exeinto /usr/lib/grub/${CHOST}
doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
fi
-
+
# bug 330745
pax-mark -m "${D}"/sbin/grub