Add the winegcc -m32/-m64 patch back in to all versions since it is now in upstream (and it fixes #110795).

Package-Manager: portage-2.1_pre3-r1

15 files changed, 52 insertions, 31 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index b04679a9607b..02ada18dfa21 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.124 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.125 2006/01/27 00:42:07 vapier Exp $
+
+  27 Jan 2006; Mike Frysinger <vapier@gentoo.org> wine-0.9.ebuild,
+  wine-0.9.1.ebuild, wine-0.9.2.ebuild, wine-0.9.3.ebuild,
+  wine-0.9.4.ebuild, wine-0.9.5-r1.ebuild, wine-0.9.6.ebuild,
+  wine-20041019-r3.ebuild, wine-20050111-r2.ebuild, wine-20050211.ebuild,
+  wine-20050310-r1.ebuild, wine-20050419.ebuild, wine-20050930.ebuild:
+  Add the winegcc -m32/-m64 patch back in to all versions since it is now in
+  upstream (and it fixes #110795).
 
   27 Jan 2006; Mike Frysinger <vapier@gentoo.org>
   -files/wine-20041019-no-stack.patch, +files/wine-no-ssp.patch,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 12a67e5dfe0a..70f5e4e4a121 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b288433532b46ce839f37c7ab19de3b3 ChangeLog 23222
+MD5 7aa80926bee1734be305fcbdddb41310 ChangeLog 23668
 MD5 fb8724a36ec3bef0ad3a3c36376b786a files/digest-wine-0.9 63
 MD5 d46df5add2535f22ad43db8247d7a45b files/digest-wine-0.9.1 65
 MD5 cc82e89428aa4f49f2f2ab3544488c02 files/digest-wine-0.9.2 65
@@ -38,28 +38,28 @@ MD5 a4727870f6da9ca5370ba0263e220f49 files/wine-no-ssp.patch 676
 MD5 68927499c968ed305a0f5125fb3b7d19 files/wine-wmf.patch 857
 MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
-MD5 9e988b9d7974d8d496108ab7d3e353f2 wine-0.9.1.ebuild 4139
-MD5 b9eff914ba660a215f9b6888a4487be4 wine-0.9.2.ebuild 4139
-MD5 bcd1daeed62677d7d025f36b9c9604d3 wine-0.9.3.ebuild 4139
-MD5 f066443f1d60dca6180bbf5dc7026404 wine-0.9.4.ebuild 4190
-MD5 23b6bcd8c8e5289045767a7efba5a906 wine-0.9.5-r1.ebuild 4142
-MD5 9b8d3b13dde00aac76619be9c363137b wine-0.9.6.ebuild 4169
-MD5 5b0219682a1f79cb46f55c8360e50889 wine-0.9.ebuild 4137
-MD5 f309bdd3f92cbd1c5c6e09a4a68c0441 wine-20041019-r3.ebuild 3494
-MD5 59efeb5f12b2323197e284d344eae34b wine-20050111-r2.ebuild 3636
-MD5 aead3d19df6656469ee2168f15ad39b6 wine-20050211.ebuild 4139
-MD5 8ecf462dc40670c3dcd0fb9c1ac822b0 wine-20050310-r1.ebuild 4239
-MD5 7832679823ce23d29c567af5269cb4a5 wine-20050419.ebuild 4179
+MD5 d3b444494f2a27a9a9c98365109248a3 wine-0.9.1.ebuild 4191
+MD5 3f2785da8dba1e5494a5d90ed90c632a wine-0.9.2.ebuild 4191
+MD5 6c7c7915fa86f3798e51f7bbcb28880a wine-0.9.3.ebuild 4191
+MD5 0f344426c4c16caa658b8b5d176a8326 wine-0.9.4.ebuild 4242
+MD5 4055b8a2267e0b048e37b23fcc70e012 wine-0.9.5-r1.ebuild 4194
+MD5 7debb9ca33ddf8033d8fbbb3ffb5550f wine-0.9.6.ebuild 4221
+MD5 31891511a06798bc25f6acef3002a29d wine-0.9.ebuild 4189
+MD5 0f675f70204760d53beb594cfac04cbf wine-20041019-r3.ebuild 3546
+MD5 dfa22b99c96de5bb079dad49a206f628 wine-20050111-r2.ebuild 3688
+MD5 76cf4b40f0445624f258f031edc7a507 wine-20050211.ebuild 4191
+MD5 678e7836325e16e972b215c2a121dac4 wine-20050310-r1.ebuild 4291
+MD5 432ac831563ea9f3e337c7740770b8c3 wine-20050419.ebuild 4231
 MD5 3c7bf58ba3c7b03f352f48e8c798acdd wine-20050524.ebuild 4242
 MD5 e50cd69e7957a2857e481c858d1949b8 wine-20050628.ebuild 4243
 MD5 fef3b6e6e1be2cd62696496c3def906e wine-20050725-r1.ebuild 4293
 MD5 e7508dd444c69b42cd58a3e7d3fcb650 wine-20050830.ebuild 4277
-MD5 d689a6f1cd379dc3d033bfc66f76c687 wine-20050930.ebuild 4247
+MD5 9e071d07dbcb7993fb9fecafec438fb8 wine-20050930.ebuild 4299
 MD5 682d2be1b51759df59002719bfe25346 wine-9999.ebuild 4113
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD2WrD2+ySkm8kpY0RAqxQAKC77xY75hC6UREpZz/UKrH7u7BCVACdGyP7
-qqZtaJgyUsDY9IV6OA0kzEE=
-=800q
+iD8DBQFD2Wxt2+ySkm8kpY0RAiBxAKC/1bARFnZqfmGF5Hf1tcD6QN565QCdFqTH
+vyoGxGW10N54Z4HcC5/wWHs=
+=booc
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-0.9.1.ebuild b/app-emulation/wine/wine-0.9.1.ebuild
index 942ff12f16c4..ce689aae013c 100644
--- a/app-emulation/wine/wine-0.9.1.ebuild
+++ b/app-emulation/wine/wine-0.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.5 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.6 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -85,6 +85,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.2.ebuild b/app-emulation/wine/wine-0.9.2.ebuild
index 2603524fb984..edc7d968a456 100644
--- a/app-emulation/wine/wine-0.9.2.ebuild
+++ b/app-emulation/wine/wine-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.5 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.6 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -85,6 +85,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.3.ebuild b/app-emulation/wine/wine-0.9.3.ebuild
index b88082aad38d..861b21ae63d2 100644
--- a/app-emulation/wine/wine-0.9.3.ebuild
+++ b/app-emulation/wine/wine-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.6 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.7 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -85,6 +85,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.4.ebuild b/app-emulation/wine/wine-0.9.4.ebuild
index bf005c98ec08..b366e4143d54 100644
--- a/app-emulation/wine/wine-0.9.4.ebuild
+++ b/app-emulation/wine/wine-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.6 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.7 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -85,6 +85,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	epatch "${FILESDIR}"/${P}-null-thread-check.patch
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
diff --git a/app-emulation/wine/wine-0.9.5-r1.ebuild b/app-emulation/wine/wine-0.9.5-r1.ebuild
index ffd28d5df793..45c37af46aae 100644
--- a/app-emulation/wine/wine-0.9.5-r1.ebuild
+++ b/app-emulation/wine/wine-0.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.2 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.3 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -85,6 +85,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.6.ebuild b/app-emulation/wine/wine-0.9.6.ebuild
index 6c4bce9c56d8..e7adfafd7143 100644
--- a/app-emulation/wine/wine-0.9.6.ebuild
+++ b/app-emulation/wine/wine-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.4 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.5 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -85,6 +85,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-0.9.ebuild b/app-emulation/wine/wine-0.9.ebuild
index b67ec95f571f..4df3f0c549b2 100644
--- a/app-emulation/wine/wine-0.9.ebuild
+++ b/app-emulation/wine/wine-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.5 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.6 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -85,6 +85,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
diff --git a/app-emulation/wine/wine-20041019-r3.ebuild b/app-emulation/wine/wine-20041019-r3.ebuild
index c428212a890d..2dcfe814ec67 100644
--- a/app-emulation/wine/wine-20041019-r3.ebuild
+++ b/app-emulation/wine/wine-20041019-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r3.ebuild,v 1.22 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r3.ebuild,v 1.23 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -59,6 +59,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050111-r2.ebuild b/app-emulation/wine/wine-20050111-r2.ebuild
index f7ac5c5d9a4f..c37851cb1853 100644
--- a/app-emulation/wine/wine-20050111-r2.ebuild
+++ b/app-emulation/wine/wine-20050111-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r2.ebuild,v 1.6 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r2.ebuild,v 1.7 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -59,6 +59,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050211.ebuild b/app-emulation/wine/wine-20050211.ebuild
index 79941f2cbe8b..af8a3385c4ac 100644
--- a/app-emulation/wine/wine-20050211.ebuild
+++ b/app-emulation/wine/wine-20050211.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.20 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.21 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -82,6 +82,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-20050211-docs.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050310-r1.ebuild b/app-emulation/wine/wine-20050310-r1.ebuild
index 8389418f7bff..be4813d6a4ae 100644
--- a/app-emulation/wine/wine-20050310-r1.ebuild
+++ b/app-emulation/wine/wine-20050310-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.13 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.14 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -83,6 +83,7 @@ src_unpack() {
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-20050310-upstream-colortable.patch #88715
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050419.ebuild b/app-emulation/wine/wine-20050419.ebuild
index dc3cc9d6d707..d508476f8e10 100644
--- a/app-emulation/wine/wine-20050419.ebuild
+++ b/app-emulation/wine/wine-20050419.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.15 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.16 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -82,6 +82,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/wine-hangfix-bug2660.patch #98156
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050725-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	epatch "${FILESDIR}"/wine-cvs-winelauncher-temp.patch #101773
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
diff --git a/app-emulation/wine/wine-20050930.ebuild b/app-emulation/wine/wine-20050930.ebuild
index 9ca56ceae5d9..2c9e8e8d2bc5 100644
--- a/app-emulation/wine/wine-20050930.ebuild
+++ b/app-emulation/wine/wine-20050930.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.10 2006/01/27 00:35:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.11 2006/01/27 00:42:07 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -85,6 +85,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/winearts-kdecvs-fix.patch
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-no-ssp.patch #66002
+	epatch "${FILESDIR}"/wine-20050830-gcc-32bit.patch
 	epatch "${FILESDIR}"/wine-20050930-no-x.patch
 	epatch "${FILESDIR}"/wine-20050930-dont-warn-lib-path.patch #107971
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785