The prototypes have been fixed in a different way apparently, so drop this patch.

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

4 files changed, 13 insertions, 45 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 51ab545a0e22..39795a23ca84 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # 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.196 2009/02/21 23:03:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.197 2009/02/23 01:25:56 vapier Exp $
+
+  23 Feb 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/bash-4.0-protos.patch, bash-4.0.ebuild:
+  The prototypes have been fixed in a different way apparently, so drop this
+  patch.
 
 *bash-4.0 (21 Feb 2009)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 3016ebacd277..f2d8d07846cc 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -21,7 +21,6 @@ AUX bash-3.2-redisplay-cursor.patch 685 RMD160 80fd6fc3eefb4cb589132f8b462b79c3e
 AUX bash-3.2-session-leader.patch 2098 RMD160 b298743fb54162d0caa8d409bf1f7b6f796c65f5 SHA1 ff136654614731ec3252ee5f34235138f0bf381e SHA256 533861310e7cba05f315ff56af32aaca5e4bdf7c2a450d4e616bb14fdf4a1f3d
 AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
 AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d6267ba826b9 SHA1 8967f82ba01bcb4913f914672d456f1d4b3682d6 SHA256 97b0ee283846e6530a0f025b1fe69054229a37b00180b82fcd44dc0c3381dc8a
-AUX bash-4.0-protos.patch 832 RMD160 1a914f49d76492a34c24fd1ab4d456da003a567b SHA1 962a6bf259ebbf82683152db0cdbc6d8bf4ccbb0 SHA256 317e50b23e6e4d8808f61e0d588a6ab1be1a351f4a4060282a8494f51d8014c7
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
 AUX bashrc 2796 RMD160 7d88ed1dbe1f88c8752b2301376f4702fc178375 SHA1 783fcfd8c3273184db638f5e61da1d0921426d00 SHA256 de72a331ed65585fd70353d0d36d5d69e229b7db52c7cb97aeefd8f1b148d218
 AUX dot-bash_logout 127 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 SHA1 9e1e6e03b033fdfcf9f2098324bac5754c26ec69 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022
@@ -100,13 +99,13 @@ EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e
 EBUILD bash-3.2_p39.ebuild 6143 RMD160 acff4775fc375029b7179b754869ff9dd9713bee SHA1 2d92ca85e9974a51873c1d13c76b09586cabf6dd SHA256 42fb91e1feaf1abc4324fd6a81a44b7dec96e6c687cc6e6316738942b7487a7f
 EBUILD bash-3.2_p48-r1.ebuild 6317 RMD160 e2694adbfe0ddf791ebea84ceb209e09032aace2 SHA1 6f6ce2f6a314df47b00f51d8302d13b4aa097806 SHA256 93393e678e15197ff4548c59d98f19c3e9492dda4fef75d3d90541d5e314991e
 EBUILD bash-3.2_p48.ebuild 6156 RMD160 3c317539d13997bfed5d217e4c56874a9879628e SHA1 242d433f223b325a5452d2dfec2118e7803cb131 SHA256 5c7031eed9f766a687805dce50eb598f156a517e558d8620a9349095aa6ba8cb
-EBUILD bash-4.0.ebuild 5830 RMD160 5796b6b50e88a60782e7accd609029c294afeece SHA1 a410346e640cedfec1858c858508c05248dabb32 SHA256 ee7ead36ffd7de31af3f1acc9d6811c1126c12a9c51e8a06cb68940df5da748e
-MISC ChangeLog 31745 RMD160 0c6335e78c94c258c3418f6d46b1c384fdf8ca3f SHA1 6c4d9e840b39ac61af3d84fdfb6e88cda880ba38 SHA256 401b27fa47e67c329936921145c3706f1fadf232c3c366a608c82a84be2ae466
+EBUILD bash-4.0.ebuild 5784 RMD160 44f1318faff6d7cdd31e8bb5b05891fb49d3566a SHA1 d3b97f0bb72ab1a8f3cdb09f2bcb6be21924badc SHA256 9c36160c2ce0eee2b10484e2e39aa52d5e2b2320908a3088c84d4d5814bc53a7
+MISC ChangeLog 31931 RMD160 29b1d595cad591bc5d209e098ecb367c8f560004 SHA1 8e61d3900809b8a48eed4c184c3655b463e8c4e6 SHA256 c014216cc4b803e248d4c18959be70a8bf0b6c5a60ac61aacd972a9556c2f37e
 MISC metadata.xml 468 RMD160 9f720f1227381137311440f58d93250f29969786 SHA1 34bdfd1f0ed219ed79850647615a3b2603a4e079 SHA256 152d66c4d8f40627855ad3b4613e0ab88ff4bbf4333542eae52d411bdeb66e5f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmgiFkACgkQn/5bYzqsSmETNQCeP7+O7Dahg4P9fsucY5yoyWpK
-1VgAoMiF+4V/dQ6uDLwYAykRybFv8rnK
-=LGZP
+iEYEARECAAYFAkmh+yoACgkQn/5bYzqsSmGEXwCgot6OgpOY3E0sbFlirGwUS7X8
+Rs8AoL9HdPHRhyac5vRYAJNVkTXfiCTT
+=4AaJ
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-4.0.ebuild b/app-shells/bash/bash-4.0.ebuild
index fdc3effdda2a..e6265da78902 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.1 2009/02/21 23:03:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.0.ebuild,v 1.2 2009/02/23 01:25:56 vapier Exp $
 
 EAPI="1"
 
@@ -68,7 +68,6 @@ src_unpack() {
 	cd ../..
 
 	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${PN}-4.0-protos.patch
 		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
 		epatch "${FILESDIR}"/${PN}-4.0-ldflags-for-build.patch #211947
 		epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
diff --git a/app-shells/bash/files/bash-4.0-protos.patch b/app-shells/bash/files/bash-4.0-protos.patch
deleted file mode 100644
index 6b38e6849973..000000000000
--- a/app-shells/bash/files/bash-4.0-protos.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-move prototypes around so they show up when needed
-
---- a/lib/glob/strmatch.c
-+++ b/lib/glob/strmatch.c
-@@ -25,9 +25,6 @@
- #include "strmatch.h"
- 
- extern int xstrmatch __P((char *, char *, int));
--#if defined (HANDLE_MULTIBYTE)
--extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
--#endif
- 
- int
- strmatch (pattern, string, flags)
---- a/lib/glob/strmatch.h
-+++ b/lib/glob/strmatch.h
-@@ -57,6 +57,7 @@
- 
- #if HANDLE_MULTIBYTE
- extern int wcsmatch __P((wchar_t *, wchar_t *, int));
-+extern int internal_wstrmatch __P((wchar_t *, wchar_t *, int));
- #endif
- 
- #endif /* _STRMATCH_H */
---- a/quit.h
-+++ b/quit.h
-@@ -21,6 +21,8 @@
- #if !defined (_QUIT_H_)
- #define _QUIT_H_
- 
-+#include "sig.h"
-+
- /* Non-zero means SIGINT has already ocurred. */
- extern volatile int interrupt_state;
- extern volatile int terminating_signal;