Replace grub-completion patch with the version I sent upstream.

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

2 files changed, 92 insertions, 55 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5c6e3d6a15ba..80ea6cb7ea11 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.333 2014/12/06 03:09:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.334 2014/12/06 03:25:14 floppym Exp $
+
+  06 Dec 2014; Mike Gilbert <floppym@gentoo.org>
+  files/grub-2.02_beta2-bash-completions.patch:
+  Replace grub-completion patch with the version I sent upstream.
 
   06 Dec 2014; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2-r5.ebuild:
   Fix bash completion symlinks.
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
index 46f65a657799..1c24f611a2d5 100644
--- a/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch
+++ b/sys-boot/grub/files/grub-2.02_beta2-bash-completions.patch
@@ -1,129 +1,162 @@
- util/bash-completion.d/grub-completion.bash.in | 39 +++++++++-----------------
- 1 file changed, 13 insertions(+), 26 deletions(-)
+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..d4235e7 100644
+index 44bf135..2b98004 100644
 --- a/util/bash-completion.d/grub-completion.bash.in
 +++ b/util/bash-completion.d/grub-completion.bash.in
-@@ -166,13 +166,11 @@ _grub_set_entry () {
+@@ -165,15 +165,8 @@ _grub_set_entry () {
+     fi
  }
  
- __grub_set_default_program="@grub_set_default@"
+-__grub_set_default_program="@grub_set_default@"
 -have ${__grub_set_default_program} && \
 -    complete -F _grub_set_entry -o filenames ${__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@"
+-unset __grub_set_default_program
+-
+-__grub_reboot_program="@grub_reboot@"
 -have ${__grub_reboot_program} && \
 - complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
-+complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
- unset __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@
  
  
-@@ -198,8 +196,7 @@ _grub_editenv () {
+ #
+@@ -197,10 +190,7 @@ _grub_editenv () {
+                 create list set unset"
  }
  
- __grub_editenv_program="@grub_editenv@"
+-__grub_editenv_program="@grub_editenv@"
 -have ${__grub_editenv_program} && \
 - complete -F _grub_editenv -o filenames ${__grub_editenv_program}
-+complete -F _grub_editenv -o filenames ${__grub_editenv_program}
- unset __grub_editenv_program
+-unset __grub_editenv_program
++complete -F _grub_editenv -o filenames @grub_editenv@
  
  
-@@ -219,8 +216,7 @@ _grub_mkconfig () {
+ #
+@@ -218,10 +208,7 @@ _grub_mkconfig () {
+         _filedir
      fi
  }
- __grub_mkconfig_program="@grub_mkconfig@"
+-__grub_mkconfig_program="@grub_mkconfig@"
 -have ${__grub_mkconfig_program} && \
 - complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
-+complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
- unset __grub_mkconfig_program
+-unset __grub_mkconfig_program
++complete -F _grub_mkconfig -o filenames @grub_mkconfig@
  
  
-@@ -254,13 +250,11 @@ _grub_setup () {
+ #
+@@ -253,15 +240,8 @@ _grub_setup () {
+     fi
  }
  
- __grub_bios_setup_program="@grub_bios_setup@"
+-__grub_bios_setup_program="@grub_bios_setup@"
 -have ${__grub_bios_setup_program} && \
 - complete -F _grub_setup -o filenames ${__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@"
+-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}
-+complete -F _grub_setup -o filenames ${__grub_sparc64_setup_program}
- unset __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@
  
  
-@@ -305,8 +299,7 @@ _grub_install () {
+ #
+@@ -304,10 +284,7 @@ _grub_install () {
+         _filedir
      fi
  }
- __grub_install_program="@grub_install@"
+-__grub_install_program="@grub_install@"
 -have ${__grub_install_program} && \
 - complete -F _grub_install -o filenames ${__grub_install_program}
-+complete -F _grub_install -o filenames ${__grub_install_program}
- unset __grub_install_program
+-unset __grub_install_program
++complete -F _grub_install -o filenames @grub_install@
  
  
-@@ -327,8 +320,7 @@ _grub_mkfont () {
+ #
+@@ -326,10 +303,7 @@ _grub_mkfont () {
+         _filedir
      fi
  }
- __grub_mkfont_program="@grub_mkfont@"
+-__grub_mkfont_program="@grub_mkfont@"
 -have ${__grub_mkfont_program} && \
 - complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
-+complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
- unset __grub_mkfont_program
+-unset __grub_mkfont_program
++complete -F _grub_mkfont -o filenames @grub_mkfont@
  
  
-@@ -358,8 +350,7 @@ _grub_mkrescue () {
+ #
+@@ -357,10 +331,7 @@ _grub_mkrescue () {
+         _filedir
      fi
  }
- __grub_mkrescue_program="@grub_mkrescue@"
+-__grub_mkrescue_program="@grub_mkrescue@"
 -have ${__grub_mkrescue_program} && \
 - complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
-+complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
- unset __grub_mkrescue_program
+-unset __grub_mkrescue_program
++complete -F _grub_mkrescue -o filenames @grub_mkrescue@
  
  
-@@ -400,8 +391,7 @@ _grub_mkimage () {
+ #
+@@ -399,10 +370,7 @@ _grub_mkimage () {
+         _filedir
      fi
  }
- __grub_mkimage_program="@grub_mkimage@"
+-__grub_mkimage_program="@grub_mkimage@"
 -have ${__grub_mkimage_program} && \
 - complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
-+complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
- unset __grub_mkimage_program
+-unset __grub_mkimage_program
++complete -F _grub_mkimage -o filenames @grub_mkimage@
  
  
-@@ -422,8 +412,7 @@ _grub_mkpasswd_pbkdf2 () {
+ #
+@@ -421,10 +389,7 @@ _grub_mkpasswd_pbkdf2 () {
+         _filedir
      fi
  }
- __grub_mkpasswd_pbkdf2_program="@grub_mkpasswd_pbkdf2@"
+-__grub_mkpasswd_pbkdf2_program="@grub_mkpasswd_pbkdf2@"
 -have ${__grub_mkpasswd_pbkdf2_program} && \
 - complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
-+complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
- unset __grub_mkpasswd_pbkdf2_program
+-unset __grub_mkpasswd_pbkdf2_program
++complete -F _grub_mkpasswd_pbkdf2 -o filenames @grub_mkpasswd_pbkdf2@
  
  
-@@ -460,8 +449,7 @@ _grub_probe () {
+ #
+@@ -459,10 +424,7 @@ _grub_probe () {
+         _filedir
      fi
  }
- __grub_probe_program="@grub_probe@"
+-__grub_probe_program="@grub_probe@"
 -have ${__grub_probe_program} && \
 - complete -F _grub_probe -o filenames ${__grub_probe_program}
-+complete -F _grub_probe -o filenames ${__grub_probe_program}
- unset __grub_probe_program
+-unset __grub_probe_program
++complete -F _grub_probe -o filenames @grub_probe@
  
  
-@@ -482,8 +470,7 @@ _grub_script_check () {
+ #
+@@ -481,9 +443,7 @@ _grub_script_check () {
+         _filedir
      fi
  }
- __grub_script_check_program="@grub_script_check@"
+-__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_program}
++complete -F _grub_script_check -o filenames @grub_script_check@
  
  
  # Local variables:
+-- 
+2.2.0
+