Drop fortify patch since it apparently doesnt work #338434 by Quasimodo.

(Portage version: 2.2_rc86/cvs/Linux x86_64)

43 files changed, 59 insertions, 166 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index ae44093c026d..447b9a639f88 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.330 2010/09/21 22:19:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.331 2010/09/25 05:35:39 vapier Exp $
+
+  25 Sep 2010; Mike Frysinger <vapier@gentoo.org> wine-1.1.10.ebuild,
+  wine-1.1.11.ebuild, wine-1.1.12.ebuild, wine-1.1.13.ebuild,
+  wine-1.1.14.ebuild, wine-1.1.15.ebuild, wine-1.1.16.ebuild,
+  wine-1.1.17.ebuild, wine-1.1.18.ebuild, wine-1.1.19.ebuild,
+  wine-1.1.20.ebuild, wine-1.1.21.ebuild, wine-1.1.22.ebuild,
+  wine-1.1.23.ebuild, wine-1.1.24.ebuild, wine-1.1.25.ebuild,
+  wine-1.1.26.ebuild, wine-1.1.27.ebuild, wine-1.1.28.ebuild,
+  wine-1.1.29.ebuild, wine-1.1.30.ebuild, wine-1.1.31.ebuild,
+  wine-1.1.32.ebuild, wine-1.1.33.ebuild, wine-1.1.34.ebuild,
+  wine-1.1.35.ebuild, wine-1.1.36.ebuild, wine-1.1.37.ebuild,
+  wine-1.1.38.ebuild, wine-1.1.39.ebuild, wine-1.1.40.ebuild,
+  wine-1.1.41.ebuild, wine-1.1.42.ebuild, wine-1.1.43.ebuild,
+  wine-1.1.44.ebuild, wine-1.2.ebuild,
+  -files/wine-1.3-shell32-fortify.patch, wine-1.3.0.ebuild,
+  wine-1.3.1.ebuild, wine-1.3.2.ebuild, wine-1.3.3.ebuild, wine-9999.ebuild:
+  Drop fortify patch since it apparently doesnt work #338434 by Quasimodo.
 
   21 Sep 2010; Mike Frysinger <vapier@gentoo.org> wine-1.3.2.ebuild,
   wine-1.3.3.ebuild, wine-9999.ebuild:
diff --git a/app-emulation/wine/files/wine-1.3-shell32-fortify.patch b/app-emulation/wine/files/wine-1.3-shell32-fortify.patch
deleted file mode 100644
index 97693178cefe..000000000000
--- a/app-emulation/wine/files/wine-1.3-shell32-fortify.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-http://bugs.gentoo.org/336887
-
-From fa3feddb19c9333e677ec6ab89e697d1005428a4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 14 Sep 2010 09:32:46 -0400
-Subject: [PATCH] shell32: use flexible arrays to avoid fortify failures
-
-Newer versions of gcc/glibc with fortify checks enabled will complain
-about the handling of the network's szNames field.  Currently it is
-always defined with a length of one which means writing more then a
-single byte will trigger:
-	In function 'strcpy', inlined from '_ILCreateEntireNetwork' at
-	dlls/shell32/pidl.c:1762:15:
-	warning: call to __builtin___strcpy_chk will always overflow destination buffer
-and then at runtime, we hit an abort().
-
-Since this field is really serving as the header to an arbitrary buffer,
-using a flexible array instead should solve the issue.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- dlls/shell32/pidl.h |    8 ++++----
- include/windef.h    |    7 +++++++
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
-index 3dbfaa6..4d5a191 100644
---- a/dlls/shell32/pidl.h
-+++ b/dlls/shell32/pidl.h
-@@ -117,7 +117,7 @@ typedef struct tagPIDLCPanelStruct
-     DWORD iconIdx;		/*02 negative icon ID */
-     WORD offsDispName;		/*06*/
-     WORD offsComment;		/*08*/
--    CHAR szName[1];		/*10*/ /* terminated by 0x00, followed by display name and comment string */
-+    CHAR FLEXIBLE_ARRAY(szName);		/*10*/ /* terminated by 0x00, followed by display name and comment string */
- } PIDLCPanelStruct;
- 
- typedef struct tagGUIDStruct
-@@ -139,7 +139,7 @@ typedef struct tagFileStruct
-     WORD uFileDate;		/*06*/
-     WORD uFileTime;		/*08*/
-     WORD uFileAttribs;		/*10*/
--    CHAR szNames[1];		/*12*/
-+    CHAR FLEXIBLE_ARRAY(szNames);		/*12*/
-     /* Here are coming two strings. The first is the long name.
-     The second the dos name when needed or just 0x00 */
- } FileStruct;
-@@ -172,12 +172,12 @@ typedef struct tagPIDLDATA
- 	  struct tagFileStruct file;
- 	  struct
- 	  { WORD dummy;		/*01*/
--	    CHAR szNames[1];	/*03*/
-+	    CHAR FLEXIBLE_ARRAY(szNames);	/*03*/
- 	  } network;
- 	  struct
- 	  { WORD dummy;		/*01*/
- 	    DWORD dummy1;	/*02*/
--	    CHAR szName[1];	/*06*/ /* terminated by 0x00 0x00 */
-+	    CHAR FLEXIBLE_ARRAY(szName);	/*06*/ /* terminated by 0x00 0x00 */
- 	  } htmlhelp;
- 	  struct tagPIDLCPanelStruct cpanel;
-           struct tagValueW valueW;
-diff --git a/include/windef.h b/include/windef.h
-index 8f5ea30..b16919f 100644
---- a/include/windef.h
-+++ b/include/windef.h
-@@ -251,6 +251,13 @@ typedef unsigned int    ULONG,      *PULONG;
- 
- #include <winnt.h>
- 
-+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-+    (defined(__GNUC__) && __GNUC__ >= 3)
-+# define FLEXIBLE_ARRAY(arr) arr[]
-+#else
-+# define FLEXIBLE_ARRAY(arr) arr[1]
-+#endif
-+
- /* Polymorphic types */
- 
- typedef UINT_PTR        WPARAM;
--- 
-1.7.2
-
diff --git a/app-emulation/wine/wine-1.1.10.ebuild b/app-emulation/wine/wine-1.1.10.ebuild
index 77b119b77bcf..da952246d6d8 100644
--- a/app-emulation/wine/wine-1.1.10.ebuild
+++ b/app-emulation/wine/wine-1.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.10.ebuild,v 1.9 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.10.ebuild,v 1.10 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="1"
 
@@ -88,7 +88,6 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.11.ebuild b/app-emulation/wine/wine-1.1.11.ebuild
index cda4f2c2acb5..35dd92a9ad97 100644
--- a/app-emulation/wine/wine-1.1.11.ebuild
+++ b/app-emulation/wine/wine-1.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.11.ebuild,v 1.9 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.11.ebuild,v 1.10 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="1"
 
@@ -88,7 +88,6 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.12.ebuild b/app-emulation/wine/wine-1.1.12.ebuild
index 6f9088363b67..28423e211e30 100644
--- a/app-emulation/wine/wine-1.1.12.ebuild
+++ b/app-emulation/wine/wine-1.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.9 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.10 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="1"
 
@@ -89,7 +89,6 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild
index 4fde1c0c4d85..bef0ea65ebcf 100644
--- a/app-emulation/wine/wine-1.1.13.ebuild
+++ b/app-emulation/wine/wine-1.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.23 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.24 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-1.1.14.ebuild b/app-emulation/wine/wine-1.1.14.ebuild
index 12ceae51aa61..5acc77909623 100644
--- a/app-emulation/wine/wine-1.1.14.ebuild
+++ b/app-emulation/wine/wine-1.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.18 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.19 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-1.1.15.ebuild b/app-emulation/wine/wine-1.1.15.ebuild
index 4a0d256cd806..adb8d5c7f0f4 100644
--- a/app-emulation/wine/wine-1.1.15.ebuild
+++ b/app-emulation/wine/wine-1.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.20 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.21 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -93,7 +93,6 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-configure-host.patch #260726
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.16.ebuild b/app-emulation/wine/wine-1.1.16.ebuild
index 0ea33d4cfae8..482937d52bb9 100644
--- a/app-emulation/wine/wine-1.1.16.ebuild
+++ b/app-emulation/wine/wine-1.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.19 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.20 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.17.ebuild b/app-emulation/wine/wine-1.1.17.ebuild
index 6cbb9583c07d..903be1b5b4bf 100644
--- a/app-emulation/wine/wine-1.1.17.ebuild
+++ b/app-emulation/wine/wine-1.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.16 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.17 2010/09/25 05:35:40 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.18.ebuild b/app-emulation/wine/wine-1.1.18.ebuild
index 9ef74d9ac918..c7dc15519ffb 100644
--- a/app-emulation/wine/wine-1.1.18.ebuild
+++ b/app-emulation/wine/wine-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.16 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.17 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.19.ebuild b/app-emulation/wine/wine-1.1.19.ebuild
index 2bc534063519..cde2c994388c 100644
--- a/app-emulation/wine/wine-1.1.19.ebuild
+++ b/app-emulation/wine/wine-1.1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.16 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.17 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.20.ebuild b/app-emulation/wine/wine-1.1.20.ebuild
index 18bfcd042bcb..233f0e42b20e 100644
--- a/app-emulation/wine/wine-1.1.20.ebuild
+++ b/app-emulation/wine/wine-1.1.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.16 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.17 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.21.ebuild b/app-emulation/wine/wine-1.1.21.ebuild
index 4d7a116b8e89..655aa19b5f03 100644
--- a/app-emulation/wine/wine-1.1.21.ebuild
+++ b/app-emulation/wine/wine-1.1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.15 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.16 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.22.ebuild b/app-emulation/wine/wine-1.1.22.ebuild
index 5f758eb7512f..2ad9b5a985a5 100644
--- a/app-emulation/wine/wine-1.1.22.ebuild
+++ b/app-emulation/wine/wine-1.1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.13 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.23.ebuild b/app-emulation/wine/wine-1.1.23.ebuild
index 8d49d27cf760..ca85a6426519 100644
--- a/app-emulation/wine/wine-1.1.23.ebuild
+++ b/app-emulation/wine/wine-1.1.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.13 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.24.ebuild b/app-emulation/wine/wine-1.1.24.ebuild
index 235b7e83a0bc..58b3b483c6ef 100644
--- a/app-emulation/wine/wine-1.1.24.ebuild
+++ b/app-emulation/wine/wine-1.1.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.13 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.25.ebuild b/app-emulation/wine/wine-1.1.25.ebuild
index 7491ab65671c..77b29fbe67ca 100644
--- a/app-emulation/wine/wine-1.1.25.ebuild
+++ b/app-emulation/wine/wine-1.1.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.13 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.26.ebuild b/app-emulation/wine/wine-1.1.26.ebuild
index 12e61ca73b9b..7780d0586535 100644
--- a/app-emulation/wine/wine-1.1.26.ebuild
+++ b/app-emulation/wine/wine-1.1.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.13 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -92,7 +92,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.27.ebuild b/app-emulation/wine/wine-1.1.27.ebuild
index 48595471a5bf..8921401f212c 100644
--- a/app-emulation/wine/wine-1.1.27.ebuild
+++ b/app-emulation/wine/wine-1.1.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.13 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.14 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -93,7 +93,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.28.ebuild b/app-emulation/wine/wine-1.1.28.ebuild
index e915c6eb1b97..ecac948e2b04 100644
--- a/app-emulation/wine/wine-1.1.28.ebuild
+++ b/app-emulation/wine/wine-1.1.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.13 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.14 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -93,7 +93,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.29.ebuild b/app-emulation/wine/wine-1.1.29.ebuild
index 1ced05450229..f1844a25a6c0 100644
--- a/app-emulation/wine/wine-1.1.29.ebuild
+++ b/app-emulation/wine/wine-1.1.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.29.ebuild,v 1.14 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.29.ebuild,v 1.15 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -94,7 +94,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.30.ebuild b/app-emulation/wine/wine-1.1.30.ebuild
index d644b97a938e..137bbf13eade 100644
--- a/app-emulation/wine/wine-1.1.30.ebuild
+++ b/app-emulation/wine/wine-1.1.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.13 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.30.ebuild,v 1.14 2010/09/25 05:35:40 vapier Exp $
 
 EAPI="2"
 
@@ -99,7 +99,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.31.ebuild b/app-emulation/wine/wine-1.1.31.ebuild
index 7c22b1063f98..bd12735a4a90 100644
--- a/app-emulation/wine/wine-1.1.31.ebuild
+++ b/app-emulation/wine/wine-1.1.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.31.ebuild,v 1.12 2010/09/21 21:54:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.31.ebuild,v 1.13 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -98,7 +98,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.32.ebuild b/app-emulation/wine/wine-1.1.32.ebuild
index c90b94a0aa4a..e1c8650296ba 100644
--- a/app-emulation/wine/wine-1.1.32.ebuild
+++ b/app-emulation/wine/wine-1.1.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.32.ebuild,v 1.12 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.32.ebuild,v 1.13 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -98,7 +98,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.33.ebuild b/app-emulation/wine/wine-1.1.33.ebuild
index 6f377967b57c..60962ccc3cce 100644
--- a/app-emulation/wine/wine-1.1.33.ebuild
+++ b/app-emulation/wine/wine-1.1.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.33.ebuild,v 1.12 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.33.ebuild,v 1.13 2010/09/25 05:35:40 vapier Exp $
 
 EAPI="2"
 
@@ -99,7 +99,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.34.ebuild b/app-emulation/wine/wine-1.1.34.ebuild
index 6a6f41fdc4d9..133e3afe2ea3 100644
--- a/app-emulation/wine/wine-1.1.34.ebuild
+++ b/app-emulation/wine/wine-1.1.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.34.ebuild,v 1.11 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.34.ebuild,v 1.12 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -99,7 +99,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.35.ebuild b/app-emulation/wine/wine-1.1.35.ebuild
index d690383cd506..5105a48176e9 100644
--- a/app-emulation/wine/wine-1.1.35.ebuild
+++ b/app-emulation/wine/wine-1.1.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.35.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.35.ebuild,v 1.10 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -99,7 +99,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.36.ebuild b/app-emulation/wine/wine-1.1.36.ebuild
index d8e04eecc80e..d06d275b11ab 100644
--- a/app-emulation/wine/wine-1.1.36.ebuild
+++ b/app-emulation/wine/wine-1.1.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.36.ebuild,v 1.7 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.36.ebuild,v 1.8 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -99,7 +99,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.37.ebuild b/app-emulation/wine/wine-1.1.37.ebuild
index efd5b9ac18f7..c4adbb7a4b0a 100644
--- a/app-emulation/wine/wine-1.1.37.ebuild
+++ b/app-emulation/wine/wine-1.1.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.37.ebuild,v 1.7 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.37.ebuild,v 1.8 2010/09/25 05:35:40 vapier Exp $
 
 EAPI="2"
 
@@ -99,7 +99,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.38.ebuild b/app-emulation/wine/wine-1.1.38.ebuild
index 0b74846d6339..b8bd9196b082 100644
--- a/app-emulation/wine/wine-1.1.38.ebuild
+++ b/app-emulation/wine/wine-1.1.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.38.ebuild,v 1.7 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.38.ebuild,v 1.8 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -99,7 +99,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.39.ebuild b/app-emulation/wine/wine-1.1.39.ebuild
index 080217c9f871..a3e5d74008ad 100644
--- a/app-emulation/wine/wine-1.1.39.ebuild
+++ b/app-emulation/wine/wine-1.1.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.39.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.39.ebuild,v 1.10 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.40.ebuild b/app-emulation/wine/wine-1.1.40.ebuild
index 1e20b30b5630..fe4da638da0f 100644
--- a/app-emulation/wine/wine-1.1.40.ebuild
+++ b/app-emulation/wine/wine-1.1.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.40.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.40.ebuild,v 1.10 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.41.ebuild b/app-emulation/wine/wine-1.1.41.ebuild
index 38cc919bd70b..66cd8a64d653 100644
--- a/app-emulation/wine/wine-1.1.41.ebuild
+++ b/app-emulation/wine/wine-1.1.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.41.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.41.ebuild,v 1.10 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.42.ebuild b/app-emulation/wine/wine-1.1.42.ebuild
index cc3b73cc48a8..be7f1496509d 100644
--- a/app-emulation/wine/wine-1.1.42.ebuild
+++ b/app-emulation/wine/wine-1.1.42.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.42.ebuild,v 1.8 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.42.ebuild,v 1.9 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.43.ebuild b/app-emulation/wine/wine-1.1.43.ebuild
index 31714b6c7fb3..1703be23a1d2 100644
--- a/app-emulation/wine/wine-1.1.43.ebuild
+++ b/app-emulation/wine/wine-1.1.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.43.ebuild,v 1.8 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.43.ebuild,v 1.9 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.1.44.ebuild b/app-emulation/wine/wine-1.1.44.ebuild
index 0d2832b3abdb..4a3ff000d5e2 100644
--- a/app-emulation/wine/wine-1.1.44.ebuild
+++ b/app-emulation/wine/wine-1.1.44.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.44.ebuild,v 1.9 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.44.ebuild,v 1.10 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.2.ebuild b/app-emulation/wine/wine-1.2.ebuild
index ed99c8e04aea..549d8e528f42 100644
--- a/app-emulation/wine/wine-1.2.ebuild
+++ b/app-emulation/wine/wine-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.4 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.2.ebuild,v 1.5 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -107,7 +107,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild
index 957a8ed5acf1..11773ddceb95 100644
--- a/app-emulation/wine/wine-1.3.0.ebuild
+++ b/app-emulation/wine/wine-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.5 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.6 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -111,7 +111,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.3.1.ebuild b/app-emulation/wine/wine-1.3.1.ebuild
index 94b9b0c65c41..2a33cf2f82c5 100644
--- a/app-emulation/wine/wine-1.3.1.ebuild
+++ b/app-emulation/wine/wine-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.3 2010/09/21 21:54:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.4 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -111,7 +111,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.3.2.ebuild b/app-emulation/wine/wine-1.3.2.ebuild
index ede7d8af1f7b..2ff82f34734f 100644
--- a/app-emulation/wine/wine-1.3.2.ebuild
+++ b/app-emulation/wine/wine-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.5 2010/09/21 22:19:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.6 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -114,7 +114,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-1.3.3.ebuild b/app-emulation/wine/wine-1.3.3.ebuild
index 965361c41327..3bcfc9e87bcf 100644
--- a/app-emulation/wine/wine-1.3.3.ebuild
+++ b/app-emulation/wine/wine-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.3.ebuild,v 1.2 2010/09/21 22:19:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.3.ebuild,v 1.3 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -114,7 +114,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 2a360091b701..a711cae5c3f4 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.62 2010/09/21 22:19:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.63 2010/09/25 05:35:39 vapier Exp $
 
 EAPI="2"
 
@@ -114,7 +114,6 @@ src_prepare() {
 		EPATCH_OPTS=-p1 epatch `pulse_patches "${DISTDIR}"`
 		eautoreconf
 	fi
-	epatch "${FILESDIR}"/${PN}-1.3-shell32-fortify.patch #336887
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
 	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die