Drop bash-completion patch until uptream approves of something.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 6 insertions, 166 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index b3f555562ccd..66e4cfcddc60 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.335 2014/12/06 06:02:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.336 2014/12/07 17:03:28 floppym Exp $
+
+  07 Dec 2014; Mike Gilbert <floppym@gentoo.org>
+  -files/grub-2.02_beta2-bash-completions.patch, grub-2.02_beta2-r5.ebuild:
+  Drop bash-completion patch until uptream approves of something.
 
   06 Dec 2014; Patrick Lauer <patrick@gentoo.org> grub-2.02_beta2-r5.ebuild:
   Remove unneeded blank line
diff --git a/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch b/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch
deleted file mode 100644
index 1c24f611a2d5..000000000000
--- a/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 4851461c8f197d15220809cf1380299f5b1a493e Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 21 Oct 2014 12:09:06 -0400
-Subject: [PATCH] bash-completion: Remove obsolete usage of 'have' function
-
-Recent versions of bash-completion do not provide the 'have' function.
-To keep things simple, this patch just removes it completely.
----
- ChangeLog                                      |  4 ++
- util/bash-completion.d/grub-completion.bash.in | 66 +++++---------------------
- 2 files changed, 17 insertions(+), 53 deletions(-)
-
-diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 44bf135..2b98004 100644
---- a/util/bash-completion.d/grub-completion.bash.in
-+++ b/util/bash-completion.d/grub-completion.bash.in
-@@ -165,15 +165,8 @@ _grub_set_entry () {
-     fi
- }
- 
--__grub_set_default_program="@grub_set_default@"
--have ${__grub_set_default_program} && \
--    complete -F _grub_set_entry -o filenames ${__grub_set_default_program}
--unset __grub_set_default_program
--
--__grub_reboot_program="@grub_reboot@"
--have ${__grub_reboot_program} && \
-- complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
--unset __grub_reboot_program
-+complete -F _grub_set_entry -o filenames @grub_set_default@
-+complete -F _grub_set_entry -o filenames @grub_reboot@
- 
- 
- #
-@@ -197,10 +190,7 @@ _grub_editenv () {
-                 create list set unset"
- }
- 
--__grub_editenv_program="@grub_editenv@"
--have ${__grub_editenv_program} && \
-- complete -F _grub_editenv -o filenames ${__grub_editenv_program}
--unset __grub_editenv_program
-+complete -F _grub_editenv -o filenames @grub_editenv@
- 
- 
- #
-@@ -218,10 +208,7 @@ _grub_mkconfig () {
-         _filedir
-     fi
- }
--__grub_mkconfig_program="@grub_mkconfig@"
--have ${__grub_mkconfig_program} && \
-- complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
--unset __grub_mkconfig_program
-+complete -F _grub_mkconfig -o filenames @grub_mkconfig@
- 
- 
- #
-@@ -253,15 +240,8 @@ _grub_setup () {
-     fi
- }
- 
--__grub_bios_setup_program="@grub_bios_setup@"
--have ${__grub_bios_setup_program} && \
-- complete -F _grub_setup -o filenames ${__grub_bios_setup_program}
--unset __grub_bios_setup_program
--
--__grub_sparc64_setup_program="@grub_sparc64_setup@"
--have ${__grub_sparc64_setup_program} && \
-- complete -F _grub_setup -o filenames ${__grub_sparc64_setup_program}
--unset __grub_sparc64_setup_program
-+complete -F _grub_setup -o filenames @grub_bios_setup@
-+complete -F _grub_setup -o filenames @grub_sparc64_setup@
- 
- 
- #
-@@ -304,10 +284,7 @@ _grub_install () {
-         _filedir
-     fi
- }
--__grub_install_program="@grub_install@"
--have ${__grub_install_program} && \
-- complete -F _grub_install -o filenames ${__grub_install_program}
--unset __grub_install_program
-+complete -F _grub_install -o filenames @grub_install@
- 
- 
- #
-@@ -326,10 +303,7 @@ _grub_mkfont () {
-         _filedir
-     fi
- }
--__grub_mkfont_program="@grub_mkfont@"
--have ${__grub_mkfont_program} && \
-- complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
--unset __grub_mkfont_program
-+complete -F _grub_mkfont -o filenames @grub_mkfont@
- 
- 
- #
-@@ -357,10 +331,7 @@ _grub_mkrescue () {
-         _filedir
-     fi
- }
--__grub_mkrescue_program="@grub_mkrescue@"
--have ${__grub_mkrescue_program} && \
-- complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
--unset __grub_mkrescue_program
-+complete -F _grub_mkrescue -o filenames @grub_mkrescue@
- 
- 
- #
-@@ -399,10 +370,7 @@ _grub_mkimage () {
-         _filedir
-     fi
- }
--__grub_mkimage_program="@grub_mkimage@"
--have ${__grub_mkimage_program} && \
-- complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
--unset __grub_mkimage_program
-+complete -F _grub_mkimage -o filenames @grub_mkimage@
- 
- 
- #
-@@ -421,10 +389,7 @@ _grub_mkpasswd_pbkdf2 () {
-         _filedir
-     fi
- }
--__grub_mkpasswd_pbkdf2_program="@grub_mkpasswd_pbkdf2@"
--have ${__grub_mkpasswd_pbkdf2_program} && \
-- complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
--unset __grub_mkpasswd_pbkdf2_program
-+complete -F _grub_mkpasswd_pbkdf2 -o filenames @grub_mkpasswd_pbkdf2@
- 
- 
- #
-@@ -459,10 +424,7 @@ _grub_probe () {
-         _filedir
-     fi
- }
--__grub_probe_program="@grub_probe@"
--have ${__grub_probe_program} && \
-- complete -F _grub_probe -o filenames ${__grub_probe_program}
--unset __grub_probe_program
-+complete -F _grub_probe -o filenames @grub_probe@
- 
- 
- #
-@@ -481,9 +443,7 @@ _grub_script_check () {
-         _filedir
-     fi
- }
--__grub_script_check_program="@grub_script_check@"
--have ${__grub_script_check_program} && \
-- complete -F _grub_script_check -o filenames ${__grub_script_check_program}
-+complete -F _grub_script_check -o filenames @grub_script_check@
- 
- 
- # Local variables:
--- 
-2.2.0
-
diff --git a/sys-boot/grub/grub-2.02_beta2-r5.ebuild b/sys-boot/grub/grub-2.02_beta2-r5.ebuild
index 5a8e751f185b..7d43818c9777 100644
--- a/sys-boot/grub/grub-2.02_beta2-r5.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r5.ebuild,v 1.3 2014/12/06 06:02:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r5.ebuild,v 1.4 2014/12/07 17:03:28 floppym Exp $
 
 EAPI=5
 
@@ -163,8 +163,6 @@ src_prepare() {
 		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
 	fi
 
-	epatch "${FILESDIR}"/${P}-bash-completions.patch
-
 	epatch_user
 
 	if [[ -n ${GRUB_AUTOGEN} ]]; then