Backport patch to remove bashisms in grub-mkconfig, bug 532200 by Rémi Cardona.

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

3 files changed, 16 insertions, 8 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 66e4cfcddc60..b23d14cee046 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,13 @@
 # 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.336 2014/12/07 17:03:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.337 2014/12/11 01:29:40 floppym Exp $
+
+*grub-2.02_beta2-r6 (11 Dec 2014)
+
+  11 Dec 2014; Mike Gilbert <floppym@gentoo.org> +grub-2.02_beta2-r6.ebuild,
+  -grub-2.02_beta2-r5.ebuild:
+  Backport patch to remove bashisms in grub-mkconfig, bug 532200 by Rémi
+  Cardona.
 
   07 Dec 2014; Mike Gilbert <floppym@gentoo.org>
   -files/grub-2.02_beta2-bash-completions.patch, grub-2.02_beta2-r5.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 6defbc77d62a..2db834c8690b 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -10,6 +10,7 @@ DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2b
 DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
 DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
 DIST grub-2.00_p5107.tar.xz 5836972 SHA256 92fd8f93621e7083f32ba6ef407f2984e5d3caaafdc35fb3d89ed054ca7c4dac SHA512 a70017dfc837e8fa869af7f71ca6191973f3f44f5a93378100cff5da425aa132b3903a3602ab907ef070872bb7a17f0586c8415845645c596d0621a4929ca83d WHIRLPOOL 5d88806fc849d2ff78ca590312110be4505e2801fee7c68faba39a54a44eedc16eb25dad88f1ff0058dea2e98382944c7e7632ccfa6f4a171ff0ef00cf67fd2d
+DIST grub-2.02_beta2-gentoo-r1.tar.xz 8048 SHA256 9a69edb0d64024b785a7f1bca58269b11e1be40f13ff2a96247249594bdb47d2 SHA512 c2ddaa188e7a2747e2256d0bb1e7c42427d5733cced3ff4b334be0671da8fab8d370861cdfee0319b4a29903a247375cf2e2a56955cc38e94a303bac5a93d974 WHIRLPOOL 0d923ed97921e145857580f7cff1f63278a4a95563d6e346b3680581991f9c7ad6d9b9965d40e407448392ee37b8c7862068281ac8f66b2a71856e1035f28eda
 DIST grub-2.02_beta2-gentoo.tar.xz 6916 SHA256 63453b35faa6e02cc6e3067160158a591ed8d1e417fc2d1fce25556b28f76e03 SHA512 edc37adae1a4c9bad4bb29f335379e1e2b0a25ba7ef2768689fe0dfc236ea7057d80699659fd5facda431df957073827eba1cd83dd0204e81f068570de3722a7 WHIRLPOOL b463cb3f4a714b20845d3dbd493a0d3408a47a1fe140ca3a4dffa77052f9bfcf25046de7881e516022aa970c48701a1278cd8b598e8e1ce03a28347fbd68dab0
 DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
 DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
@@ -21,14 +22,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 8556 SHA256 02b6bf199a68fe9b065fbb007c0cd1e2fcbb959772f10df69ec548c2f6d797b9 SHA512 9b490da8e857c641757d4fb06fd4e4a912e4a70d3423aa978a4f7cca5469ecca460c776e7f497473f50d4a30747eea94751f2818b03748143caaec97458e0b6c WHIRLPOOL 9c739514e43a6ed73cd93f8a21eb39f75931a4ae53889060a75ab52b0ad7b163150a0ece9fa0d7993cb006cc17b202f6e1425703f23def332dd24d952f40063c
+EBUILD grub-2.02_beta2-r6.ebuild 8559 SHA256 ae38382b1a22d44da2b4e51f09977b96129a1fe6a1487aee5c9b5bcaf9b91201 SHA512 9e1081e83a34b130c0a80385795ab7b47d83304a7006b5fe14220c4a5d05856505a1d6937b1f1b002c3e5b7137aaa543033b2499b8c0b862d935bd1e71136601 WHIRLPOOL e4b356e9fa39d98b09ec340073b7c7640a4f6c9f9fa3d6cbbbc7df8c5020ffd68c696ffca319b79b5d2304c1ba6559c57670b9a875201edb7e732b349d051045
 EBUILD grub-9999-r1.ebuild 8265 SHA256 4cbbf5b3b600b1c295c0b14b7157174d6817f9c2724db311868dc54572fcb286 SHA512 6ca182564c008970a68d340587773f62181497bb76c5ab5820e13fce6cd041045a320b29ae0a758f90820fd320cece8acb18b5c28507e54e11b6920fdc690085 WHIRLPOOL 889ffae3843a84c182bc48736084c5706c065e8144177292837d5291522002b8a75bcdf3a780204d7b34d7d2fa11a75730e324d4971a821d895c0842baf15554
-MISC ChangeLog 64561 SHA256 5d68d3d0b7b5fa7b02e179ce88b116a9551734f0e77723abf645eaefc00eac3d SHA512 b797960deaf55d23c42cab28a512bd07301187f8c3184d37ad893af74a09cd62f4450f087ce9af2847eea397798ec0c9077e55dfa0ea2e016e6ce9a7406eed8e WHIRLPOOL 904bfdaa6b37e5b7570223911a026fca5a5acd0b6c827a15a53ca777a01c8a2d8696594beb608f90acefbbeb7d4f7370bd804459e7af67b2b614372e11e284ab
+MISC ChangeLog 64789 SHA256 8196ef6da5f96edc5316f135668c5fc89a28ca6c2245e78f019851e0356ed429 SHA512 e32ffe4651cea3209e2271081ce207fa866b962919896fad0d0f3b73bbd3de3729c7815e8eab751f15029f16fb2c8312b3594eb4ad210bce62397198c4dffb67 WHIRLPOOL 6fe5282700a61f499f418e23b96e2f700d8e2ebb3adad08b9c92088e25b9903aaac001b2b218dbb28d7683a8bc3d45f6c81ac51e06dca48594e8bfd91064fad0
 MISC metadata.xml 876 SHA256 dbd75c8e18ec8479718c0d802e6563535e9ffe5429727bea5b26133bb41abca2 SHA512 7a617c5f150445add695fda85610aae706070ca1368e250a4e3858c817e90322860174e436a60268d7ff66f33bc7672aa6d4cdb8b705e12851b25666eb51e13b WHIRLPOOL bf9ba7714a9f41789778c97c0387f5cb6be6e985f63953ab25f12bfad526ca48ef973f202cfd0d8a95dc8dd595d8b1a12483403ece3a5616e24f417e42b4c303
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSEiGUACgkQC77qH+pIQ6TYvAD+KKmqS+ZFaq8TY7eMDQTZvycR
-KB48xRCl3XwfprYjbrgA/jmncnKHwGvatCi+DHSap0EAHEzQnSFtdyfGncUNacNk
-=33KX
+iF4EAREIAAYFAlSI84UACgkQC77qH+pIQ6RalwD+IN+I6jTjIfN07zfuq/72nhn8
+4/IRjQUM1r7DwxH/sFIA/2XyiP1kGD+k5oZLlZak6Y6cau86R8liOKSVO0ll6EGN
+=rd9f
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.02_beta2-r5.ebuild b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
index 7d43818c9777..8e33f3f3e600 100644
--- a/sys-boot/grub/grub-2.02_beta2-r5.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r6.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.4 2014/12/07 17:03:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r6.ebuild,v 1.1 2014/12/11 01:29:40 floppym Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ if [[ ${PV} != 9999 ]]; then
 		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
 		MY_P=${P/_/'~'}
 		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
-			http://dev.gentoo.org/~floppym/dist/${P}-gentoo.tar.xz"
+			http://dev.gentoo.org/~floppym/dist/${P}-gentoo-r1.tar.xz"
 		S=${WORKDIR}/${MY_P}
 	else
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz