Dont require multilib files when USE=win64 #269439 by Mikel Olasagasti.

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

11 files changed, 37 insertions, 31 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 3beb04f83a76..7e020e673395 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,12 @@
 # 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.262 2009/05/08 20:46:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.263 2009/05/16 16:08:42 vapier Exp $
+
+  16 May 2009; Mike Frysinger <vapier@gentoo.org> 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-9999.ebuild:
+  Dont require multilib files when USE=win64 #269439 by Mikel Olasagasti.
 
 *wine-1.1.21 (08 May 2009)
 
diff --git a/app-emulation/wine/wine-1.1.13.ebuild b/app-emulation/wine/wine-1.1.13.ebuild
index 0e4d3d8b09d9..f579b82134ba 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.10 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.13.ebuild,v 1.11 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.14.ebuild b/app-emulation/wine/wine-1.1.14.ebuild
index 26d3347c6046..64af8c541fc1 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.5 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.14.ebuild,v 1.6 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.15.ebuild b/app-emulation/wine/wine-1.1.15.ebuild
index de83103517a5..17c07bec6197 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.7 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.15.ebuild,v 1.8 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.16.ebuild b/app-emulation/wine/wine-1.1.16.ebuild
index b3659c085483..5d90956ed109 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.6 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.16.ebuild,v 1.7 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.17.ebuild b/app-emulation/wine/wine-1.1.17.ebuild
index 712be0d45a09..178b937e0ab3 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.3 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.17.ebuild,v 1.4 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.18.ebuild b/app-emulation/wine/wine-1.1.18.ebuild
index 46bc1e6a5bdb..cb65da65106b 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.3 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.18.ebuild,v 1.4 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.19.ebuild b/app-emulation/wine/wine-1.1.19.ebuild
index 53ca7621d027..e9cad0a451f8 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.3 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.19.ebuild,v 1.4 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.20.ebuild b/app-emulation/wine/wine-1.1.20.ebuild
index 1a61e7fca46c..87558d7e151f 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.3 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.20.ebuild,v 1.4 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-1.1.21.ebuild b/app-emulation/wine/wine-1.1.21.ebuild
index 1738d307e4ae..3606c21ec4cd 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.2 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.1.21.ebuild,v 1.3 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 3a41ef5fa6a4..a3ff783e15e1 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.36 2009/05/08 20:47:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.37 2009/05/16 16:08:42 vapier Exp $
 
 EAPI="2"
 
@@ -60,14 +60,14 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	ssl? ( dev-libs/openssl )
 	png? ( media-libs/libpng )
 	win64? ( >=sys-devel/gcc-4.4.0 )
-	amd64? (
+	win64? ( amd64? (
 		X? (
 			>=app-emulation/emul-linux-x86-xlibs-2.1
 			>=app-emulation/emul-linux-x86-soundlibs-2.1
 		)
 		app-emulation/emul-linux-x86-baselibs
 		>=sys-kernel/linux-headers-2.6
-	)"
+	) )"
 DEPEND="${RDEPEND}
 	X? (
 		x11-proto/inputproto