Call epatch_user #282735 by Michał Górny.

(Portage version: 2.2_rc40/cvs/Linux x86_64, RepoMan options: --force)

33 files changed, 106 insertions, 60 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 5dc70c7c3648..e9705df729f8 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.272 2009/08/26 21:39:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.273 2009/08/26 21:57:56 vapier Exp $
+
+  26 Aug 2009; Mike Frysinger <vapier@gentoo.org> wine-1.0.ebuild,
+  wine-1.0.1.ebuild, wine-1.1.0.ebuild, wine-1.1.1.ebuild,
+  wine-1.1.2.ebuild, wine-1.1.3.ebuild, wine-1.1.4.ebuild,
+  wine-1.1.5.ebuild, wine-1.1.6.ebuild, wine-1.1.7.ebuild,
+  wine-1.1.8.ebuild, wine-1.1.9.ebuild, 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-9999.ebuild:
+  Call epatch_user #282735 by Michał Górny.
 
 *wine-1.1.28 (26 Aug 2009)
 
diff --git a/app-emulation/wine/wine-1.0.1.ebuild b/app-emulation/wine/wine-1.0.1.ebuild
index 0e7b109a3e93..a9f66807d84c 100644
--- a/app-emulation/wine/wine-1.0.1.ebuild
+++ b/app-emulation/wine/wine-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.1.ebuild,v 1.2 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.1.ebuild,v 1.3 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -86,8 +86,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.0.ebuild b/app-emulation/wine/wine-1.0.ebuild
index dd29e959b7e8..81e3943c7175 100644
--- a/app-emulation/wine/wine-1.0.ebuild
+++ b/app-emulation/wine/wine-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.ebuild,v 1.3 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.0.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -86,8 +86,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.0.ebuild b/app-emulation/wine/wine-1.1.0.ebuild
index 548f4ca7721a..c26d058c4cbb 100644
--- a/app-emulation/wine/wine-1.1.0.ebuild
+++ b/app-emulation/wine/wine-1.1.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-emulation/wine/wine-1.1.0.ebuild,v 1.5 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.0.ebuild,v 1.6 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -86,8 +86,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.1.ebuild b/app-emulation/wine/wine-1.1.1.ebuild
index 10a609715af3..9f2df7424011 100644
--- a/app-emulation/wine/wine-1.1.1.ebuild
+++ b/app-emulation/wine/wine-1.1.1.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-emulation/wine/wine-1.1.1.ebuild,v 1.4 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.1.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -86,8 +86,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.10.ebuild b/app-emulation/wine/wine-1.1.10.ebuild
index c48ea205829e..08adbe325481 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.3 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.10.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -87,8 +87,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.11.ebuild b/app-emulation/wine/wine-1.1.11.ebuild
index 9a47f4b2f015..3ca6d0dc8748 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-2008 Gentoo Foundation
+# Copyright 1999-2009 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.3 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.11.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -87,8 +87,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.12.ebuild b/app-emulation/wine/wine-1.1.12.ebuild
index 25a6c4c9cd9f..880368d15432 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-2009 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.3 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.12.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -88,8 +88,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild
index ade34c44de25..18b8ee5ec35c 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-2009 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.13 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.14 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -86,6 +86,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	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 e371f056b6d5..6c4bd88e4e3f 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-2009 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.8 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.9 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -86,6 +86,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	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 d468f4f2f10d..76b21bc3fcea 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-2009 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.10 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.11 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -88,6 +88,7 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-configure-host.patch #260726
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.16.ebuild b/app-emulation/wine/wine-1.1.16.ebuild
index 5e7c7eb06744..3f968d4c498b 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-2009 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.9 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.10 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.17.ebuild b/app-emulation/wine/wine-1.1.17.ebuild
index b83426e89fc0..75780494fa68 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-2009 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.6 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.7 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.18.ebuild b/app-emulation/wine/wine-1.1.18.ebuild
index a086ec68d946..1034c62f9355 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-2009 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.6 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.7 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.19.ebuild b/app-emulation/wine/wine-1.1.19.ebuild
index 7a3a45ac7195..77d4c73babd2 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-2009 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.6 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.7 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.2.ebuild b/app-emulation/wine/wine-1.1.2.ebuild
index 85e5c60701fe..c16314d6c410 100644
--- a/app-emulation/wine/wine-1.1.2.ebuild
+++ b/app-emulation/wine/wine-1.1.2.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-emulation/wine/wine-1.1.2.ebuild,v 1.4 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.2.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -86,8 +86,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.20.ebuild b/app-emulation/wine/wine-1.1.20.ebuild
index 6b67b4ca93bc..9363a6e769d0 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-2009 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.6 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.7 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.21.ebuild b/app-emulation/wine/wine-1.1.21.ebuild
index aca25a5a3372..cd85304ea524 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-2009 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.5 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.6 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.22.ebuild b/app-emulation/wine/wine-1.1.22.ebuild
index fda9603bf1aa..6b651bb1b25a 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-2009 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.2 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.22.ebuild,v 1.3 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.23.ebuild b/app-emulation/wine/wine-1.1.23.ebuild
index 40bf5ade0461..96c2697066a9 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-2009 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.2 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.23.ebuild,v 1.3 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.24.ebuild b/app-emulation/wine/wine-1.1.24.ebuild
index de636edfcd69..6ddda1df3278 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-2009 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.2 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.24.ebuild,v 1.3 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.25.ebuild b/app-emulation/wine/wine-1.1.25.ebuild
index 95d47d8438a1..439e47104f06 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-2009 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.2 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.25.ebuild,v 1.3 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.26.ebuild b/app-emulation/wine/wine-1.1.26.ebuild
index 9832785fc6b0..a2c123099ba1 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-2009 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.2 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.26.ebuild,v 1.3 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.27.ebuild b/app-emulation/wine/wine-1.1.27.ebuild
index 97387760305c..86fbed48d748 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-2009 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.2 2009/08/18 08:17:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.27.ebuild,v 1.3 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.28.ebuild b/app-emulation/wine/wine-1.1.28.ebuild
index ffd3359b9c09..b300f493698e 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-2009 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.1 2009/08/26 21:39:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.28.ebuild,v 1.2 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -87,6 +87,7 @@ src_unpack() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+	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.3.ebuild b/app-emulation/wine/wine-1.1.3.ebuild
index 87921a04cdc0..bd7887f823a2 100644
--- a/app-emulation/wine/wine-1.1.3.ebuild
+++ b/app-emulation/wine/wine-1.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.3.ebuild,v 1.4 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.3.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -86,8 +86,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.4.ebuild b/app-emulation/wine/wine-1.1.4.ebuild
index 9ac0b0a1285c..fd6be22b1833 100644
--- a/app-emulation/wine/wine-1.1.4.ebuild
+++ b/app-emulation/wine/wine-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.4.ebuild,v 1.5 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.4.ebuild,v 1.6 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -86,10 +86,11 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
-	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 	epatch "${FILESDIR}"/${P}-install-fix.patch #237011
+	epatch_user #282735
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
 config_cache() {
diff --git a/app-emulation/wine/wine-1.1.5.ebuild b/app-emulation/wine/wine-1.1.5.ebuild
index 2761bc348b30..b0bec9d4dc67 100644
--- a/app-emulation/wine/wine-1.1.5.ebuild
+++ b/app-emulation/wine/wine-1.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.5.ebuild,v 1.3 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.5.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -86,8 +86,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.6.ebuild b/app-emulation/wine/wine-1.1.6.ebuild
index b06a53f75e48..46be682310d2 100644
--- a/app-emulation/wine/wine-1.1.6.ebuild
+++ b/app-emulation/wine/wine-1.1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.6.ebuild,v 1.4 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.6.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -87,8 +87,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.7.ebuild b/app-emulation/wine/wine-1.1.7.ebuild
index 95505c5e3764..7df4bdeacc96 100644
--- a/app-emulation/wine/wine-1.1.7.ebuild
+++ b/app-emulation/wine/wine-1.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.7.ebuild,v 1.4 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.7.ebuild,v 1.5 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -87,8 +87,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.8.ebuild b/app-emulation/wine/wine-1.1.8.ebuild
index 95a94abdf706..9def5444de1e 100644
--- a/app-emulation/wine/wine-1.1.8.ebuild
+++ b/app-emulation/wine/wine-1.1.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.8.ebuild,v 1.3 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.8.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -87,8 +87,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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.9.ebuild b/app-emulation/wine/wine-1.1.9.ebuild
index 3f5da0a9aee6..acc5c457e8f9 100644
--- a/app-emulation/wine/wine-1.1.9.ebuild
+++ b/app-emulation/wine/wine-1.1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.9.ebuild,v 1.3 2009/04/27 05:59:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.9.ebuild,v 1.4 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="1"
 
@@ -87,8 +87,9 @@ src_unpack() {
 	fi
 	cd "${S}"
 
-	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
+	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-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 18b499a7f636..6dd6f823be9a 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.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-emulation/wine/wine-9999.ebuild,v 1.39 2009/08/01 06:58:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.40 2009/08/26 21:57:56 vapier Exp $
 
 EAPI="2"
 
@@ -86,6 +86,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch_user #282735
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }