summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot/grub')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/Manifest12
-rw-r--r--sys-boot/grub/grub-1.99_rc1.ebuild7
-rw-r--r--sys-boot/grub/grub-9999.ebuild7
4 files changed, 23 insertions, 9 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 739fa3a26b46..4e121d89326e 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -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.155 2011/05/29 17:25:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.156 2011/06/28 16:33:29 vapier Exp $
+
+ 28 Jun 2011; Mike Frysinger <vapier@gentoo.org> grub-1.99_rc1.ebuild,
+ grub-9999.ebuild:
+ Install into the right bash-completion dir #373201 by Rodrigo Severo.
29 May 2011; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
Convert to EAPI=2 and do not run `set -e` with eautoreconf #369093 by Zachary
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index b454ec8b8f7b..e56466e7276c 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -40,14 +40,14 @@ EBUILD grub-0.97-r8.ebuild 8941 RMD160 4caee80e02de14e6a88a3ab016df32f90c258f09
EBUILD grub-0.97-r9.ebuild 9045 RMD160 5db30743506d7ae274695a94bd1c7c5fea8003e2 SHA1 4796cd56c8e77239719bd31a0542b11129e7922f SHA256 153939f732549503f08dd2acff27325b3e398ffc065e16c1749281c6c66a97d5
EBUILD grub-0.97.ebuild 4494 RMD160 f798b7101af90add6d45725e34aeb7f219e0b748 SHA1 fbb215b293127635ba41e7fa952518e5e07f118a SHA256 d08c03989b1cd6ad91fa2e1a098e0230994570472d0f11a6d926e21e06071c58
EBUILD grub-1.98.ebuild 3039 RMD160 1208a2709adc8e38cfc8c7ce4c3057fbb3c7ba6c SHA1 9bf4f4af9ce15cc5a4813c5396e5b7045ce423f1 SHA256 7c6a9f04eceadfef0371752bd4a7263aae0c2fcea2c515756416d403ef702566
-EBUILD grub-1.99_rc1.ebuild 3168 RMD160 fef601e56c45f2037e2b7ef28a5c148dd20770f7 SHA1 86f3e8294f880412f7ab7e4f611297ae8e024caa SHA256 4324b1360c890146fc7a3d2232a025ba6ef65084a7769e619184aa73e3053ce7
-EBUILD grub-9999.ebuild 3170 RMD160 5ea30043cbff75eaba4bea805d1f5e4f027c0f7e SHA1 2d9ab026a1501ff6521bd85b01b554ee2a07133e SHA256 a0aff2aba3fbf1674b48cc9fc8827a93e3400ff6ac2dc8a34ff29c0ddd600031
-MISC ChangeLog 31915 RMD160 29d70c2724a38c1fa93fec0208acbe7260586d32 SHA1 19cff0222c9432e89afd332976450bc94e2df034 SHA256 b32893e538ef723e0e410eb77ce3fc622993bf437a3eadbb5ce4e068654c50ea
+EBUILD grub-1.99_rc1.ebuild 3347 RMD160 abc01235bd7fc8d0d48c5efefd5a7dc460695109 SHA1 79e5c0a70ef3ba6d1eaf60402fc185125e23c875 SHA256 6b533ba9d8a383de31ab111a017c41ef6ad1e2442530ed597ab3545f4e6a30da
+EBUILD grub-9999.ebuild 3346 RMD160 4a24a72eb43a0e29eaf756dae2696121e6ca72ba SHA1 fab0993885e5bcecc5bfcb72730edfee6aeeba54 SHA256 c0202b92fb00b9cfa648b0049cb2a68db7b57caf30c42a09f72fb23af5918314
+MISC ChangeLog 32080 RMD160 b9401c479d8b3546c0d405cef14ea28f08e45ff2 SHA1 64ffcd07764ef086539ba365dd7edbf133929be4 SHA256 46d736a1bfc2cf302aaaac5ba83b79e49a3482ef6a585efb8b157203e91d0314
MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk3igXgACgkQaC/OocHi7JZkPQD+NqeydI6VDMzDu569Pkjr7nX4
-UgD/nSaGv9BQdLpgCr8A/2IR8OLHzGKbPluCdex2r6pkW/zcPMoOpCdwH6zdgrf3
-=yfvu
+iF4EAREIAAYFAk4KAmIACgkQaC/OocHi7JasWQD/WkTD2LGVjuu0uDhRLHLfLkkS
+wAIgmOYjMpxaCv4je+UA/Ra7vJtJGCszbMbjmConlpn7Rwds997cBoaCdJbMuddl
+=ESg/
-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.99_rc1.ebuild b/sys-boot/grub/grub-1.99_rc1.ebuild
index 5a46db117254..19d1469c5753 100644
--- a/sys-boot/grub/grub-1.99_rc1.ebuild
+++ b/sys-boot/grub/grub-1.99_rc1.ebuild
@@ -1,6 +1,6 @@
# 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-1.99_rc1.ebuild,v 1.3 2011/04/10 14:34:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.4 2011/06/28 16:33:29 vapier Exp $
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
@@ -52,6 +52,11 @@ src_unpack() {
sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
(. ./autogen.sh) || die
fi
+
+ # install into the right dir for eselect #372735
+ sed -i \
+ -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
+ util/bash-completion.d/Makefile.in || die
}
src_compile() {
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 40b4b5997ff7..bdbc8516fc95 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
# 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.33 2011/05/29 17:25:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.34 2011/06/28 16:33:29 vapier Exp $
# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
EAPI="2"
@@ -47,6 +47,11 @@ src_prepare() {
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
(. ./autogen.sh) || die
fi
+
+ # install into the right dir for eselect #372735
+ sed -i \
+ -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
+ util/bash-completion.d/Makefile.in || die
}
src_configure() {