Fix from upstream for new |& construct.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 25 insertions, 7 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 05fe0d3ff63f..885073bbdf99 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.204 2009/02/25 21:54:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.205 2009/02/25 22:46:41 vapier Exp $
+
+  25 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-4.0-pipeline-reserved-word.patch, bash-4.0.ebuild:
+  Fix from upstream for new |& construct.
 
   25 Feb 2009; Mike Frysinger <vapier@gentoo.org>
   +files/bash-4.0-reset-parser-current-token.patch, bash-4.0.ebuild:
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index a711934da1f7..00a62fa3111c 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -26,6 +26,7 @@ AUX bash-4.0-exit-checkjobs.patch 549 RMD160 11158eb2bb4cb8fb0ac53db23b2d4d4cf54
 AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d6267ba826b9 SHA1 8967f82ba01bcb4913f914672d456f1d4b3682d6 SHA256 97b0ee283846e6530a0f025b1fe69054229a37b00180b82fcd44dc0c3381dc8a
 AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea51e323 SHA1 8fe1b27ad67e3e3b098b7ddeb6ded35594a9b106 SHA256 771f89825fc81ff035f1b03dfe1e65b7e58a0039c005067b0c37414b84ddbf2b
 AUX bash-4.0-pcomplete-save-parser-state.patch 398 RMD160 ef9a279d06a0079cfd125b97f5d6ecb3b8dfe650 SHA1 a8b55818701c8530749ab428ed8e5b4870af8770 SHA256 55fff1801912eb7c0f7c8199ee82f40c7c11ad75e36811ca127ed0ff01e51a58
+AUX bash-4.0-pipeline-reserved-word.patch 317 RMD160 fcc48428006c3568e710ca34d358b75c1a619baf SHA1 0db8babe5b2d08a3248ecb907aeb10e8e127ebd4 SHA256 add2b514bbe25bc366b97a6e969cbeae9f730ac39a63058876eb059840aedeba
 AUX bash-4.0-reset-parser-current-token.patch 366 RMD160 1404b8630475b1e74cea4263fbba0dd24db986fc SHA1 09ac2b6a96b96b239969abd0f2e8821088868377 SHA256 3436ac9a07b685a84c8c396c2db19326b975e5649c3596577a012cab96bd58f5
 AUX bash-4.0-save-current-token.patch 749 RMD160 cdedf40d43e2190e50f148e88d5f65cef9a5a594 SHA1 480d2cabfe4a17072c39691ad89c225a60c7e45c SHA256 af2e1262038308ce98929de59c4c7e4f811490956deb30fc4953e4bb9f702139
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
@@ -106,13 +107,13 @@ EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e
 EBUILD bash-3.2_p39.ebuild 5950 RMD160 22536f34ab6d2eb7d2475c1e4e4cdaacc451df4b SHA1 4cfc39d407627fd7d6d446a0e9b3ed6ce35a2b5f SHA256 c9503776590b2b117773e4000d6aa6e0c73e2b0f32589dcfddab146109e9ea7c
 EBUILD bash-3.2_p48-r1.ebuild 6124 RMD160 c3b16af5c8d019cb58c57a45ad5be2b9d93b4f2a SHA1 3e8e9ce6957f67abce65678f501883b4cf3b8ad4 SHA256 2895b32812a63c6208bb2a11ef60911751e09dbd42db39dae2d2acd90f9faba6
 EBUILD bash-3.2_p48.ebuild 5961 RMD160 9ab905aeac020d82d8369a4853ac208afd4f7b17 SHA1 382b66ff687601decb3bbed25bf0465a2f7fbe93 SHA256 8794b417a6be993a370d2ca7a6bacfef66bb003e06ea410bdedf5b0a33666f65
-EBUILD bash-4.0.ebuild 5749 RMD160 08d6a09ff027237b6e1f4972efb2962952e136a0 SHA1 f6ea556a668096415537f36d7aa86e2312ff2a35 SHA256 dbfad07f5fd7917c6c6a765aabc73f8dff66d965648631038aca27be69baa2e6
-MISC ChangeLog 33184 RMD160 11e0c190bf6909f4711680ab81c09de919cc94a1 SHA1 c3a21030fe4ed287cea59c7c50c93a529be63e16 SHA256 a244dfc8c347be1a4d8b93f5747d56e16b0209d81ffc3b6d4e0525e82b9c6aa0
+EBUILD bash-4.0.ebuild 5807 RMD160 fdd6d660576705362497029e22b1e689057aa8d4 SHA1 4f43fb78762044e18af95bd46754a46c5eec0962 SHA256 eb480383f8ce1470fcb2dec01b2bcdb1657ebeaf8c4c4e5f6278c9b185b5dba8
+MISC ChangeLog 33342 RMD160 c071c708c0de43d2239485309d99a29b79697446 SHA1 d8fab0b6e0a4ebc7c0d624b9a63f09cafe64f68d SHA256 58d7666d9d15b6b4e559dcefa2f4e07f5a3d9732ab53f8425342e4e580650a66
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmlvhcACgkQn/5bYzqsSmHAywCgk8fSQtM/TwQptBDU4yWOZORf
-zmUAnjgVsgj/G4CS5Rb4UMQZP3VwRWJQ
-=JxdX
+iEYEARECAAYFAkmlylcACgkQn/5bYzqsSmGdJgCfX/Kh2zPlFzXSTH+HXpnPyL5i
+6ZgAn3hEp79metY6RniQEBL3SGdXmBKQ
+=sECg
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0.ebuild b/app-shells/bash/bash-4.0.ebuild
index bb3b9ae9fd3f..fc516276b0cf 100644
--- a/app-shells/bash/bash-4.0.ebuild
+++ b/app-shells/bash/bash-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0.ebuild,v 1.9 2009/02/25 21:54:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0.ebuild,v 1.10 2009/02/25 22:46:41 vapier Exp $
 
 EAPI="1"
 
@@ -73,6 +73,7 @@ src_unpack() {
 		epatch "${FILESDIR}"/${P}-exit-checkjobs.patch
 		epatch "${FILESDIR}"/${P}-declare-identifier.patch
 		epatch "${FILESDIR}"/${P}-reset-parser-current-token.patch
+		epatch "${FILESDIR}"/${P}-pipeline-reserved-word.patch
 		epatch "${FILESDIR}"/${PN}-4.0-negative-return.patch
 		# Log bash commands to syslog #91327
 		if use bashlogger ; then
diff --git a/app-shells/bash/files/bash-4.0-pipeline-reserved-word.patch b/app-shells/bash/files/bash-4.0-pipeline-reserved-word.patch
new file mode 100644
index 000000000000..3f9da0e17a89
--- /dev/null
+++ b/app-shells/bash/files/bash-4.0-pipeline-reserved-word.patch
@@ -0,0 +1,12 @@
+http://lists.gnu.org/archive/html/bug-bash/2009-02/msg00202.html
+
+*** ../bash-4.0/parse.y	2009-01-08 08:29:12.000000000 -0500
+--- parse.y	2009-02-25 17:25:56.000000000 -0500
+***************
+*** 4450,4453 ****
+--- 4457,4461 ----
+      case AND_AND:
+      case BANG:
++     case BAR_AND:
+      case DO:
+      case DONE: