Drop bash-completion patch until uptream approves of something.

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

4 files changed, 18 insertions, 169 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/Manifest b/sys-boot/grub/Manifest
index 20d8f099384b..6defbc77d62a 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 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
@@ -19,7 +21,14 @@ EBUILD grub-0.97-r13.ebuild 9384 SHA256 c694ab37f477548da2b98c9beb2c5432ddd799e4
 EBUILD grub-0.97-r14.ebuild 10015 SHA256 ac4c43cee05874f5efb5b7c14f9709e8d60d230b6291924a6e1afdae7e6a288b SHA512 3c9673df98c57f3b9bc7a415ccc829ff89a06cb94ffb1562f74e78e0ee4286fe4b7b18c5f447ec4d772d07bfd3e7ed1238571b794f0fc3094cf247fe09fadfd3 WHIRLPOOL df766fd952d9bb2f1505a8dbae6d52d6014b3561de59b2c15ae4a751968cd0ce20674698a2415bef5719cfee5e7c2062ccae2a0e88a9283a88fc83d6daa0b9a9
 EBUILD grub-2.00_p5107-r2.ebuild 8180 SHA256 1db3f6266e63332ef89d9c32895189fee3307a5ca2f687620df43c5a9d52547a SHA512 f95264d8eff99a1dd8420d64539aef4b7eb464edc8119076af7c175fac418d0e554ee7bb0ae4edb57c3a1a5b82f32da51db6b7ffc4a9a62dc7541d3694b65faa WHIRLPOOL d1dd247120f6de17aaea2899760fd7daf3eb242a3945f6ae2c03eae71c33e3c6bb780639a030d9ba46f4b9b8f23d383fc6559306e40a82be293466ce6d6270a5
 EBUILD grub-2.02_beta2-r3.ebuild 8311 SHA256 faadf60c068832270094eb8d1c9a0eef02ba6373e3079afee0e997509f885bab SHA512 329cf6586b12cfacc2b853e48c2dd786694c73441d930f44e5712e9f999a9f96f6669708ef94760b4bd831f57766ebd079f5974e955e856ed8091ba7da5b4556 WHIRLPOOL 939484dceaa7a0c663ed3da420ec1233d04032817634fd046fb4c8732933c6031021e6f21b9c066e6a2531ebc721bb5a40ad8d3309a407d9d40b543a04b2c588
-EBUILD grub-2.02_beta2-r5.ebuild 8607 SHA256 77a6b3ac62987b6f7d3713ee994ea57c9a4b8c3b37f6034460fd80381e5b4299 SHA512 300103f10b243256840786371a00d85061b34351692ed2e6aca30e7652f2c54f0018fc32dcaa3dcd9dbe683736ddbd1637058b4078c6d07f05c3f7307144185e WHIRLPOOL bd27eb60eeba7d345785e2fa22a83387d3475c5810487895ba0a45c9effce6edaea3f9c4eab3f63d2bbbd6a0bd2c3e9ac5f366158eaf8639852230f505e4f373
+EBUILD grub-2.02_beta2-r5.ebuild 8556 SHA256 02b6bf199a68fe9b065fbb007c0cd1e2fcbb959772f10df69ec548c2f6d797b9 SHA512 9b490da8e857c641757d4fb06fd4e4a912e4a70d3423aa978a4f7cca5469ecca460c776e7f497473f50d4a30747eea94751f2818b03748143caaec97458e0b6c WHIRLPOOL 9c739514e43a6ed73cd93f8a21eb39f75931a4ae53889060a75ab52b0ad7b163150a0ece9fa0d7993cb006cc17b202f6e1425703f23def332dd24d952f40063c
 EBUILD grub-9999-r1.ebuild 8265 SHA256 4cbbf5b3b600b1c295c0b14b7157174d6817f9c2724db311868dc54572fcb286 SHA512 6ca182564c008970a68d340587773f62181497bb76c5ab5820e13fce6cd041045a320b29ae0a758f90820fd320cece8acb18b5c28507e54e11b6920fdc690085 WHIRLPOOL 889ffae3843a84c182bc48736084c5706c065e8144177292837d5291522002b8a75bcdf3a780204d7b34d7d2fa11a75730e324d4971a821d895c0842baf15554
-MISC ChangeLog 64369 SHA256 7c4ff2bc82ad7384ffa88806ba9d2ba8af716fceb6cb9adb7fd7896620276afb SHA512 2ee1c97addf68c4d865d97c1dd743f54f9765cc602d0271b1cd5f96b2a2eb852535df1c2eaa84021cd189a45ec2d011844347618466970078c7d3198d542cfce WHIRLPOOL a7c8ce0ec26e7710ac4c183113ba37d1829fd93d257a28d1fc5345c415255c57d0004be158f4ee647d7b5d7c0fff78f04d5aff6bcde2ee3d67ebe5517397ef7d
+MISC ChangeLog 64561 SHA256 5d68d3d0b7b5fa7b02e179ce88b116a9551734f0e77723abf645eaefc00eac3d SHA512 b797960deaf55d23c42cab28a512bd07301187f8c3184d37ad893af74a09cd62f4450f087ce9af2847eea397798ec0c9077e55dfa0ea2e016e6ce9a7406eed8e WHIRLPOOL 904bfdaa6b37e5b7570223911a026fca5a5acd0b6c827a15a53ca777a01c8a2d8696594beb608f90acefbbeb7d4f7370bd804459e7af67b2b614372e11e284ab
 MISC metadata.xml 876 SHA256 dbd75c8e18ec8479718c0d802e6563535e9ffe5429727bea5b26133bb41abca2 SHA512 7a617c5f150445add695fda85610aae706070ca1368e250a4e3858c817e90322860174e436a60268d7ff66f33bc7672aa6d4cdb8b705e12851b25666eb51e13b WHIRLPOOL bf9ba7714a9f41789778c97c0387f5cb6be6e985f63953ab25f12bfad526ca48ef973f202cfd0d8a95dc8dd595d8b1a12483403ece3a5616e24f417e42b4c303
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlSEiGUACgkQC77qH+pIQ6TYvAD+KKmqS+ZFaq8TY7eMDQTZvycR
+KB48xRCl3XwfprYjbrgA/jmncnKHwGvatCi+DHSap0EAHEzQnSFtdyfGncUNacNk
+=33KX
+-----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
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