Added another upstream fix. Removed old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 44 insertions, 18 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index ca4661f8fd43..d6e9df3c4182 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.367 2014/05/07 08:23:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.368 2014/05/07 15:28:10 polynomial-c Exp $
+
+*bash-4.3_p11-r4 (07 May 2014)
+
+  07 May 2014; Lars Wendler <polynomial-c@gentoo.org> -bash-4.3_p11-r3.ebuild,
+  +bash-4.3_p11-r4.ebuild, +files/bash-4.3-localvar-invisible.patch:
+  Added another upstream fix. Removed old.
 
 *bash-4.3_p11-r3 (07 May 2014)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index f9bd6fce5afe..defd130efde3 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -31,6 +31,7 @@ AUX bash-4.2-speed-up-read-N.patch 2858 SHA256 8547d32535ed4e2fe5cb7b3503e6044c3
 AUX bash-4.3-complete-dequoting.patch 945 SHA256 8f93d94e6269224b7ff1ab0526efeaf673344b18397a29e1ae90e1ae632f460c SHA512 fc98f2a3f043aebd05c31349a3819ac27f18055b1364afe2d4ef01fb5cbc9392083b23c3c9245b566bbce41eb31145b62f65a5b064b05e11612a769e0ffe3d13 WHIRLPOOL 0ac006f130f868eb8f1f795221a713257356faae79a735b973be7848a0f754c0c1d194dd76111b4b511b0bb1d9fd610b3eb7fe331c9f60a27a029718ce283833
 AUX bash-4.3-extglob-directory.patch 2750 SHA256 35a832cd5f68e4289d02911321434ed7a50246bf078f00eeed81bc6b9646ed8c SHA512 20f185958ed396193102eb6a1e26ed3058e755486d6d83ee3b562e1bdfb3cd397a3dddcdcb8a479405e872574aef58ef5f4a8d0512edc1af591c1c47bb5feb10 WHIRLPOOL 70d5c37b14b15eaa9dd0a24ca96b8486c39ee1b950bfd8e7735265294dd6214068f4c056563f7a8b9ae828ae72de08ba5343bceb87c69d1b79a25e0a9ab1447b
 AUX bash-4.3-jobs-run-sigchld-trap.patch 450 SHA256 f8041cc88b3b72927ecdfc1b4e0977066b0e2275bcdf12c0b103396bb3f4eb3d SHA512 f4b1d25f5b95af0a9059e4a69bfdc7b7b09aaf6be96ac03a051bc7eb79773e8e941ea03118ebc087bd89f78cc43c1bd29be760e7c11ad33eb208d608a5c36ee8 WHIRLPOOL 9fea0392ac77071a0dce3ee039289ea24fd3ea15de6a8858d2a2dcd11bb7edfe9ce62ef2237e795ea1cc3416c7fc8529948f8530a5b4939fe43a59bf262ee35a
+AUX bash-4.3-localvar-invisible.patch 631 SHA256 bb1f183c6f302a3eb81bd559cc6cc72fe05f8d29b8eb5d5c9d9fdf3c711cee03 SHA512 69e915e65e62ef25a557896e7b17fa2bf40b8744be8656bb4aa2c7265973b5400708ce4d544c0473df2b837906e06f225e697aa0933222cbeb41b6ca220e1773 WHIRLPOOL c2e0c2a67455bc3779a8fea20d7e2737ae1c37b4cdeef914e50eda1c1fbbf62fffcce4d8c8dc9033173b151d19d630845761393a0c5c44b19a75f50e99099f40
 AUX bash-4.x-deferred-heredocs.patch 1255 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 WHIRLPOOL f3a2ef5245c446b7e90917e987d80efba5e6437dbe86fc27bbd7768bc5f1e5f6e7663b350ca8a81a3f21a29af6e1594c14061be0d818fce6a4a63aed7efcb6fe
 AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b
 AUX bashrc 2870 SHA256 52715d113347ac51c63206697a48c341aceeddf7474eb6150e8fcea3f4163bdc SHA512 f841e6b3a28d78773bfc1118c6314c03bff4b0e8f5c8b334e156a299bcb64232c46c14c433b734cfbab2aa9faca8f94c2a10b76f8db8f1cdad81b35761ca5d2b WHIRLPOOL af08d0a5403bea70198d0a01443322594f36efdaec38e0183bb04a81fb5cde45ab6726720949364c8fb37f43af979cdaaf75ca184fdbfdde0f038ea13946ba24
@@ -225,23 +226,23 @@ EBUILD bash-4.1_p11.ebuild 4199 SHA256 b6163a5d4aef950e3b5dad8c2590323549072b9f8
 EBUILD bash-4.2_p45.ebuild 6525 SHA256 784442914f6f6740031598a0cf1baaec087d973e6460d76a32baa120a2794b8e SHA512 8b6c57dead7a18b429632694e5d1e35791b262cd09c3d49919287c2b07ab9e524b9a758e247a8d2706ddfae2576d19e535c9467b7ef99ed08ddb041ef60025da WHIRLPOOL 55954d5cb13b064f89305af8c5de0c7f84714afb08c0f07bf4703ef62860cf08f9e9f38ba60a4e891d5cb0f26f0e46d26e2eea553b0785bc9e82d790b6c4d111
 EBUILD bash-4.2_p47.ebuild 6647 SHA256 c215fe883cd37a3aa70102401ecd2a153e8e0917b2430fecfe618ed3deef5710 SHA512 bc783f9287e7456f626e6caa55b83a50383289cca3899b8d6a0023e69e0335d498615156e997f1ce417408f7ae4cffe74e68cbcf4c1363e7c7c8df07b7f2ea74 WHIRLPOOL 848161565e680196e5e4e5b631a8a873c5425d0ed6658b9226d6b7371ce3f90f78501a6fd062894d02dc382412b53fb72ec45fea5eae4b19a9637cf2ef4a8851
 EBUILD bash-4.3_p11-r2.ebuild 6816 SHA256 5e6f4dabf962d9dac7d719ff1b77191f8c08c911fa531da6facd0e916dd5d1a9 SHA512 167bc13325fd8d61a1788284649c8cc24cd3e2c81788dd5f93f476d1a6c2c0590aeaa4210fe591af2eb6167eea69924a8bc677083949775b1194ff6ef31c4357 WHIRLPOOL c30258aca275a63e60634d8c43e37b11d72c76a89db35292f8bf1e5936510893686ee04f3cb883c9f532534829bc87e9479f3f03de1c25bedb514ee18c100295
-EBUILD bash-4.3_p11-r3.ebuild 6868 SHA256 9ebe700168dc2bb473257c99acba988a07cc2fb2c411e940eda1d9f98210771d SHA512 99351a8c98af91983789bdd52b4869b4606e1b2b0809ae7bff3fe5b9a8140d43f50bfe3d14b619d274d18534ad866a7ced5879862246ceec55fe0124e1a470a1 WHIRLPOOL a581a3f4c02e02852745eeb9845f46197d5af3cabe5f926101237bd9a294c7472de5767365ed13a277235a2e2aa6c75201540d490346790a3d996511e9c03385
-MISC ChangeLog 57069 SHA256 7c19b5ab668cc1ab75ff5876076fe35cb0788f1b05159afb8a7d381349710d2f SHA512 df1752b9b766b88b79d6532f6f0c8e6a59c6dfd6bdc7a73df16f02e577e1f7359ee0d2721a48e4d7e6ce98121bf934c43732aea971bcd2033d2d71ae506de8b5 WHIRLPOOL 5a2d44fd7e3cf98ff0f45b5262813b0e05336ce98700d94ab58b19122032ad599a831b21b29c8dbc07c7a617c47e2e1780db681121abec597bdf1b4fc42a9167
+EBUILD bash-4.3_p11-r4.ebuild 6921 SHA256 f568ede3635f2994f029fb2f7f31e5fe762c5b1c06a2b327fae590086f2243a7 SHA512 8247f707b61c911a3719f70e4ca44e8fa7380ba7a01b9658d0e69516c81aff1902221024b182eddfd05e10972863613db7c50e7333745cc5091fe9c8ba9fcbd7 WHIRLPOOL 6d5761071f3872299abce0d7da2a647b7022b304d21043c51236f607c1b9e5a961831542f1c97877e60eb1327e7dcacb256d99888fe7197ab28d7a733a4f33ed
+MISC ChangeLog 57293 SHA256 54786b9e4d270699adc883a81fb87fb65a9c7899bd7bdf8dfb8cb59ea93ad32b SHA512 e7d8e5b26df1c6ff33cb809e1585f2bc57fcf3fad2b1378c6e03521c52357e202777553836ef8f45679f9bff497ede0fdac08f02cb1f553b891f74f434693ba7 WHIRLPOOL e061c99be0eba773a108bb5b3cb7c25399fe5ee394e7812c417e4819cf04e12183f9dd104f516bd8425f099fbf9bee11287ef3b8ffc5369af78d375585478bdf
 MISC metadata.xml 643 SHA256 928c1ec952dec872f913d5e121725431435f651a87e48e784617c49f9dcf806a SHA512 3eb4baf0efbee2606a1e56d0359c3489887fb3f2e0dfe9ba25b6143b9d5e02b8df06a8065019201184b1fca12b8a86d781a68131810b80784c678765d55df679 WHIRLPOOL 52aeb839d294d5f43af735698afb6ee8f99e388c86260e1a1cc0d8fa57671bb8bef36f09d3f7e84cb70bc5fba0d645b427033c13b6ebbc66f5520acb1985b8b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTae1yAAoJEPiazRVxLXTFHnoP/0hDnkovpwl11bpv2COo9b+Q
-tu3+73lgRHNQOgcuT6Nrcn6B2PA9J5pMYCMo1cTXJPzx3maAyXu51lqhbtX3Cq/v
-fB/Yowr46Spho/M9XPmHUaV3+7aRBwWHXUuxGSNJ9mk3+Z3hnAO0Pg/PfTgRvTME
-8E6eGLJeUNMrhIjVNyg3T2Q48hJ0CMA80ngnCp/EKEp/CqHTtbFZ9erqg2ouzVxE
-Q//T0BdTvIePukrvmbYAjtGxaYJGJWmf61N9ZjgJGn+BR3EMLwB+q9nYT63n70LI
-C/jOhhhzCJ34fPHHSBvf79NNT2QIR4pMXsdP3Hsc4knj8OnbjQ7yCcmqfPO9c7bL
-TuGWan4MwzJTjtqvW5BNxB6/9/DsXdVkhcX9q9hj45O7IiQRitg0xe/eM3JkRYQU
-AFG9eJhgh0TlyVw+lY3czEBOZFVtrrd7LdFm9WDtgJa9DnN5besZFQTpY+Jp/uCs
-SHIyQybEwPP1tUB1damN5IY3JmT8lYPf3rNo0qMGII3KbuGW9FvEh+KKGDvDQAIg
-UqwwwgMJpxb8S4Ijv39CK5RbOeZFKj7Fy12MGHtOY8Lcy/kyf0ybDQ178R36ivDg
-yshAPFF8OnUZM068Xr+a8sXRN0xVnvNnmFRMx3E/ZPLPDAV9fuTgzf2Lu+P4T41V
-iyrTtMb7bppCgMfel2y2
-=2/cK
+iQIcBAEBCAAGBQJTalEMAAoJEPiazRVxLXTF3xsP/2MBo8tdUkKRwOxBwhv/a5J8
+g2AA+XN5fpWHa/8v+4qWJS9V5LqcU2u68pqOlAAhjHxjjxbOMTxe73U73Q6n3Mj2
+3QTtw7abThSY3N3jd/GZ4BeVs9ivuq9V+9vvIXaxZ87xLJMvOBAorgY97/JEEqQy
+Sf2PbAidqObS/89fMUe5d7ZN1tRQstpVKmJS8ipO1U0DIzNEmmnjdRDO/6DfQT43
+q+dFwt+q3aq5goJjLPhDPgWPzgxJMQfpqAsJPthNspjuf407ZEb2S89fbYpI6Z+m
+EiU2PXg9u1pvUGfbXicR1OWuVMW1iK4XjTg1StlxMMJtBqZPgvCDUq9Mk8lFrklz
+r15NLbo0MUExSIvO+Mi8fHYh68bsxyFe5vDT2TP258ycOq7eDdwi/VdQXbEefu/3
+AYwQsDrvfJPcoWoamp5Fb5vlJiA0RQNQoB1/tos7cUVQ7u7qy03pCXhCdGjsOkOv
+8lnxVa14/moekNIiEVVR09M24gWTet1r0uSzeg9k9j8QCy3kvNxYT1lTDPfbouBx
+G/sT2fFvIhrwIWXolki+1yYbQba9iUDpygH32guV8IrLfbcqPiizTCypBzGbXUiu
+hE79jUs+5lX9A8PCxGlWVhQKr9BETA84u95mKrm5sLfFE/K3g48kotaUQ5Zp+u0i
+IcrbQgETL4TPIUopHF0F
+=+GE2
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.3_p11-r3.ebuild b/app-shells/bash/bash-4.3_p11-r4.ebuild
index 1eb6a8d6ce51..b5a0d9f8e52c 100644
--- a/app-shells/bash/bash-4.3_p11-r3.ebuild
+++ b/app-shells/bash/bash-4.3_p11-r4.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/app-shells/bash/bash-4.3_p11-r3.ebuild,v 1.1 2014/05/07 08:23:12 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p11-r4.ebuild,v 1.1 2014/05/07 15:28:10 polynomial-c Exp $
 
 EAPI="4"
 
@@ -85,7 +85,8 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-4.3-jobs-run-sigchld-trap.patch \
 		"${FILESDIR}"/${PN}-4.3-complete-dequoting.patch \
-		"${FILESDIR}"/${PN}-4.3-extglob-directory.patch
+		"${FILESDIR}"/${PN}-4.3-extglob-directory.patch \
+		"${FILESDIR}"/${PN}-4.3-localvar-invisible.patch
 
 	epatch_user
 }
diff --git a/app-shells/bash/files/bash-4.3-localvar-invisible.patch b/app-shells/bash/files/bash-4.3-localvar-invisible.patch
new file mode 100644
index 000000000000..dbfffbbf4cf5
--- /dev/null
+++ b/app-shells/bash/files/bash-4.3-localvar-invisible.patch
@@ -0,0 +1,18 @@
+*** ../bash-4.3-patched/variables.c	2014-02-14 11:55:12.000000000 -0500
+--- variables.c	2014-05-07 10:53:57.000000000 -0400
+***************
+*** 2198,2205 ****
+    old_var = find_variable (name);
+    if (old_var && local_p (old_var) && old_var->context == variable_context)
+!     {
+!       VUNSETATTR (old_var, att_invisible);	/* XXX */
+!       return (old_var);
+!     }
+  
+    was_tmpvar = old_var && tempvar_p (old_var);
+--- 2260,2264 ----
+    old_var = find_variable (name);
+    if (old_var && local_p (old_var) && old_var->context == variable_context)
+!     return (old_var);
+  
+    was_tmpvar = old_var && tempvar_p (old_var);