summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-06-28 16:33:29 +0000
committerMike Frysinger <vapier@gentoo.org>2011-06-28 16:33:29 +0000
commitc3041e5925544befc99b73e57bf3909f595c31b1 (patch)
tree83ba0af93ee3e5a66ed9ab2932e24359e5045edc /sys-boot/grub
parentMarking cbflib-0.9.0-r3 ppc for bug 352065 (diff)
downloadgentoo-2-c3041e5925544befc99b73e57bf3909f595c31b1.tar.gz
gentoo-2-c3041e5925544befc99b73e57bf3909f595c31b1.tar.bz2
gentoo-2-c3041e5925544befc99b73e57bf3909f595c31b1.zip
Install into the right bash-completion dir #373201 by Rodrigo Severo.
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/grub')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-1.99_rc1.ebuild7
-rw-r--r--sys-boot/grub/grub-9999.ebuild7
3 files changed, 17 insertions, 3 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/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() {