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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 97 insertions, 60 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/Manifest b/sys-boot/grub/Manifest
index ea3704e99243..719636f52a96 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX grub-2.00-freetype-2.5.1.patch 752 SHA256 95ddb348097df2bdf51a36529935118ad4bb51cb780038d149ed0ae3bf0693c9 SHA512 e9d05de956364b923e01d8f71d77f05d6c0815b7ae21ec5d34875de09770ce42b52f7d410314f7e4a273256350d7cbf311cf95a5d83e469c7a83b9b69879caff WHIRLPOOL 67751eaad605cf064106f2a304657bf1fe1ea1f4bb3f6efe436f2d7e6b84e80b56327e51cff4db63a7f34e7f21a456d3c7517d6ee6da5f8f2cbd7816f34d4016
-AUX grub-2.02_beta2-bash-completions.patch 4262 SHA256 a375f26661a7795f33bc98dadfe56bea4ee048792d98073c27f940344baaa240 SHA512 5e9a3406ef6abc4b7b2f2ec75c538029729efb6c6257ef9fd90986d5d37eabcaa4a52ce19530a6afc0f5002739553697e4f4ad523cff849aa6ebfcf2c896ad83 WHIRLPOOL d12db12ef47b507ac3ea3adbd223f7d9393cfdd088eddbf994c81c57420840dd69c235ea81e853215fc309b64ffbef78bb02860011d89356d99aed1f3454a55d
+AUX grub-2.02_beta2-bash-completions.patch 4785 SHA256 f6cbd2226373c58f6e767914e86778869b755f85ed2394900262e0026c26781b SHA512 5f49c9f427f81916facf66a334d9bbcca5d83e7bcb7f8ffafa117e7185a732c2c97a56076a8aa76da6b44a4133e09fe22e99633fbc176eae6329045767e0feec WHIRLPOOL 06b0b950e4749ac99073fe6ac34541218bad188a71fff398882811d9f57008763b795709760f6b022ea9aebc4ab72f9b8c224eb27ae1ea71313ce80b8f33c92c
 AUX grub-2.02_beta2-libzfs.patch 612 SHA256 f2de3680168e7a88261ac3f0fab6131ad3e22ce732ce969c0dc0efbf583aaddb SHA512 17810d390c90e39df63121af4d8dd670a87703d3f589aa26edde7c7e9f8f6e88dfb93a156040062c6cfe03615126970b3b073d688b3ec52cfb6ae401ad31754c WHIRLPOOL 0f19a0684b04bd7494068686fb6596a5f7c4a2e1dc47edb21c4841342876414b5caf367c0cb777e1b42f82e8db1d8eccb20151f89c36da7050aeb9db1616ad4f
 AUX grub.conf.gentoo 591 SHA256 e656b5716d6a5904a035960b460494431d8c1327df51fcd9ffb39243425fe142 SHA512 23036b9e558b604082d9ae8c848f18ea552181416937e3ef62287e53c38086b8d7ffef0e67d04af04f05f5b23c6da7aaf1f1f23e0ee1cffd5dbd5320e8648cb1 WHIRLPOOL 184284cac00bc039d36c5b2f8d7be0f425e75ba904c4c04c2ec531a094cd191c42cb7382276e73a5d176e1661dcdd1bdc5e3806b9d7abe9b38563575ecb6ee76
 AUX grub.default-2 1602 SHA256 d1c11fb4decbae9a9827866ec2126b2c11a3d8f6b41278acad139b4dd34338c5 SHA512 15085cdfe706379d931c6841c34403ffcb46765be75425a29b563d69169124447606d8f8444945ed1148ac734da4f12f14a9b18abd6b0501974c1c770ad13c39 WHIRLPOOL 2f72b2a3d4048261cf3d5477b9a33264b3214a803eebcf4b782c33cf71d045e9be878407c64c720c2a7b260a65f8e32a61974c55ebd8d464e0b947133cdf49fd
@@ -24,12 +24,12 @@ EBUILD grub-2.00_p5107-r2.ebuild 8180 SHA256 1db3f6266e63332ef89d9c32895189fee33
 EBUILD grub-2.02_beta2-r3.ebuild 8311 SHA256 faadf60c068832270094eb8d1c9a0eef02ba6373e3079afee0e997509f885bab SHA512 329cf6586b12cfacc2b853e48c2dd786694c73441d930f44e5712e9f999a9f96f6669708ef94760b4bd831f57766ebd079f5974e955e856ed8091ba7da5b4556 WHIRLPOOL 939484dceaa7a0c663ed3da420ec1233d04032817634fd046fb4c8732933c6031021e6f21b9c066e6a2531ebc721bb5a40ad8d3309a407d9d40b543a04b2c588
 EBUILD grub-2.02_beta2-r5.ebuild 8608 SHA256 a90b67c2bda4a4aad44616744a5b44457efcb2f4d8c95469a32afe2b48b8a3fb SHA512 943c777bce0b28fbd937949494cd54a8179997edca252950a2cecaffe39138494d5ab5caebff5ae7c18c3e3ce1b45cbe0df906475387efc2b758614e8342bd9d WHIRLPOOL 9731e428a2488666c3b523d53cd13a002598b53a18905689664beb871b035fcadfad6428ec82f2597a6cb5f9174cd725dd3568517f18c5e464c7f7ed5db03c60
 EBUILD grub-9999-r1.ebuild 8265 SHA256 4cbbf5b3b600b1c295c0b14b7157174d6817f9c2724db311868dc54572fcb286 SHA512 6ca182564c008970a68d340587773f62181497bb76c5ab5820e13fce6cd041045a320b29ae0a758f90820fd320cece8acb18b5c28507e54e11b6920fdc690085 WHIRLPOOL 889ffae3843a84c182bc48736084c5706c065e8144177292837d5291522002b8a75bcdf3a780204d7b34d7d2fa11a75730e324d4971a821d895c0842baf15554
-MISC ChangeLog 64098 SHA256 76c3f4478e67bce1a3a892774b3b9367561faa38020bf299d5ead0f0371d581b SHA512 bfaeaa016159fa72a3bce77f712891f6cd517d537576bb3fafacfbbb5a3138fa5254b4678468b670f565a0cb75e03b488d0e3911f80bb951072f34bf4fbc0830 WHIRLPOOL 2834d5ab8009df89cde13e4f30c3ef9317a2341041c22cfd7a875d387b020350f72f8d2653067fbf9e79cad1dc5e8c90d505d099af629a87b2d692bf7a4944b7
+MISC ChangeLog 64262 SHA256 5017e03852fb5d83cf75f611dc304582bff13461b4ada22f46fa6b0474f081c5 SHA512 7f12bdee32bf44498edbc5c1e97fefadbc0be90725212270724ff288866f529a70017b3a64436dd6ea0b7f0c0b7ed7a9c0c4da11512e9ff067719c7221797819 WHIRLPOOL 4fea79083a885bdb189b7847ff97531ea967f617b49f30d0cdfa067e1142cc3a0c3fc9f7dab5a48e000bde95c807ad70a4bc790c549c94f3adf10bf34d8aa745
 MISC metadata.xml 876 SHA256 dbd75c8e18ec8479718c0d802e6563535e9ffe5429727bea5b26133bb41abca2 SHA512 7a617c5f150445add695fda85610aae706070ca1368e250a4e3858c817e90322860174e436a60268d7ff66f33bc7672aa6d4cdb8b705e12851b25666eb51e13b WHIRLPOOL bf9ba7714a9f41789778c97c0387f5cb6be6e985f63953ab25f12bfad526ca48ef973f202cfd0d8a95dc8dd595d8b1a12483403ece3a5616e24f417e42b4c303
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSCc4sACgkQC77qH+pIQ6TLSwD/dNl6ReQ8wE1ARAh+Drz3Swix
-0Be2l/3W7uecYB3BbD8A/iWcgXSQudVwxeo/O9oaryArDLz6/yfPay1/fraTmrJa
-=IqQg
+iF4EAREIAAYFAlSCdxsACgkQC77qH+pIQ6QOKgD+Lmhu8dRZHhXrh+fJMeAvOabp
+kEpKg7dEG/zY54sFHNsBALeoabRaE3Xwadz/1wFy+n2XnYpTKVgCyDyMgVzWsrjH
+=ghT6
 -----END PGP SIGNATURE-----
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
+