Drop amd64 check with USE=win64 now that it is in x86 use.mask.

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

6 files changed, 33 insertions, 25 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 920372b6658d..fe5a03405f95 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # 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.324 2010/09/06 20:38:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.325 2010/09/07 17:10:15 vapier Exp $
+
+  07 Sep 2010; Mike Frysinger <vapier@gentoo.org> wine-1.3.0.ebuild,
+  wine-1.3.1.ebuild, wine-1.3.2.ebuild, wine-9999.ebuild:
+  Drop amd64 check with USE=win64 now that it is in x86 use.mask.
 
 *wine-1.3.2 (06 Sep 2010)
 
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 22dae6cef23e..bc1fa03060d5 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -114,16 +114,16 @@ EBUILD wine-1.1.7.ebuild 3949 RMD160 86cd90b5371d33f4da49f1be29a18b96153ff731 SH
 EBUILD wine-1.1.8.ebuild 3949 RMD160 f15eb40dc5032677d5e81967b1b8c457760e2d1f SHA1 f7eb82932af67073f656dbcee96105f45f877ee1 SHA256 10eae77eecb23da15079c268c3cdf14a0d71af4405866f0d52c157dd19e6e0f8
 EBUILD wine-1.1.9.ebuild 3949 RMD160 0ab246600933e04c6316cd85ada3c882f6e72b7f SHA1 22e1aceac6158879cc3242612025987aad9792a5 SHA256 fa0d8060129b7c31d689d489f367f8508ca35f758c3fa022507ff5ae78cd4f94
 EBUILD wine-1.2.ebuild 4997 RMD160 7473f56b8ba5e74d1aa15c58e575ea58b03ca1ba SHA1 03f0ca7d2292e0520759422a3a283506a51f3e2b SHA256 04671b9e40500395a9e87dec3925b9cb12065bfaad1558afc933c45e75d08b78
-EBUILD wine-1.3.0.ebuild 5547 RMD160 ddb7b6f074bad0b520bbe32f9d47ba756605e907 SHA1 ed77a3f79b9a59225dddda62b2e5526d628be9f6 SHA256 ab274e8afa94feb3ce7a2643c378f7cd2317e1da3013abf1c6b4ea80d61d247b
-EBUILD wine-1.3.1.ebuild 5547 RMD160 9189cb51c0efa58badb58b03538c66ef2fd7e289 SHA1 f784c4b8f45a1de71e7cf478ad4f33178680fcda SHA256 a5ef842dc56e175a73646a98190c4007b360b50941c6e2e20738af859cb4ad9f
-EBUILD wine-1.3.2.ebuild 5547 RMD160 abfe0863f38529eed2755a0a8bb48b302b3fe409 SHA1 c6bf30419eb2501e4bb9b253cb2ba7847cbe2d14 SHA256 36aba8a4fc51e785199b0e7b007fad185e6d7ab1ef3dc037ffb6baaa668354bb
-EBUILD wine-9999.ebuild 5547 RMD160 485274152888ab5646976be7ed479307970cd53a SHA1 fa0f3b1f4bebbefd677945ed4439786c7ad511b3 SHA256 ae935a2e34f96853379f895f87d62142f281178733c7165854dcfc4960639b05
-MISC ChangeLog 60786 RMD160 0f44b5b7b0eaec0aea8e94bed8416ecd6620e41c SHA1 ec90fd5093837f1a162148c6bfd60823681b5b34 SHA256 2bdf11addb0ff7c8ae963d005e2655d56ae1ae6a09c3d40797023e8574573143
+EBUILD wine-1.3.0.ebuild 5539 RMD160 6076fe0302b8ab0308ec8bbc6ee34ed1387e7316 SHA1 c709a9f9e8a0a17d26b6b375a79ccb78137bab07 SHA256 b507e9fe72fb6e72b46c7463cf756376edc3fab2df841cca15544989b67edc73
+EBUILD wine-1.3.1.ebuild 5539 RMD160 b2d488c44db60ca706a6e121a007cbd939beb901 SHA1 db8acea341f3a6a5b483834299b0faf03a69b49f SHA256 88ef37a3bd71503cea6323158237045c3eb4920556f4c8d6ada666e0d6a52239
+EBUILD wine-1.3.2.ebuild 5539 RMD160 e5d5d5e277eca950cc3a9dec37409c66a7cadefe SHA1 4c63b4b512d67cab286bdb76b9269096d157d549 SHA256 70a68b6bca3b73e9de1db63f1bbc91ab55e98de062eeedb54f6829c359b41581
+EBUILD wine-9999.ebuild 5539 RMD160 f7ed972a261f8529e3d904a32b5934efcb687bca SHA1 d7c43274363d8d0e80636224b194bd4def671afe SHA256 0f80e2eee162bbd45dcdb3e4a59b2baabca757f07763811a588414c3e46741c6
+MISC ChangeLog 60980 RMD160 cacbc2b68e057d9336a2813964633be27fad558a SHA1 056682993114249ecd2aa713a28c85d3d4093d41 SHA256 03388616207239def5c253554609236a6a693faf3ed5e6057a3107576a5c67c1
 MISC metadata.xml 1417 RMD160 6956a69da8c1a72542e91d63b9e194247df3b781 SHA1 0a050a0047bbd4d750b57600b6f608c7411a7d0b SHA256 dc1c6fda02c66f6edf0b3095b1edc57e3730eece0b7eb4d15e67e0daa1bc9c50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyFUVoACgkQTwhj9JtAlp64fwD+PmSh8TYNtRHxge0Zcfe0oZH7
-qbZYleu3uNnAap2xkFQBALemYKJzHzA7hVf08DkO4DuTdcfa5TK49/AA27vT/AeI
-=HS09
+iF4EAREIAAYFAkyGciwACgkQTwhj9JtAlp41xAD/Xs84HOEC2TPjc69Zg0Vdldvi
+D14suAC+G9RozkX6GoEA/1BYzXLL6Wqr4Ei4x8AWBWDPwnPUZsdsThNEMCXSWzXL
+=aXtS
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild
index e04de1f56f2b..f8206a82d7fe 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.3 2010/08/06 20:54:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.4 2010/09/07 17:10:15 vapier Exp $
 
 EAPI="2"
 
@@ -94,8 +94,9 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 src_unpack() {
-	if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
-		use win64 && die "you need gcc-4.4+ to build 64bit wine"
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
@@ -165,7 +166,7 @@ src_configure() {
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
 
-	if use win64 && use amd64 ; then
+	if use win64 ; then
 		do_configure 64 --enable-win64
 		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
 	else
diff --git a/app-emulation/wine/wine-1.3.1.ebuild b/app-emulation/wine/wine-1.3.1.ebuild
index 9700638b8740..587b832356c1 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.1 2010/08/30 05:20:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.1.ebuild,v 1.2 2010/09/07 17:10:15 vapier Exp $
 
 EAPI="2"
 
@@ -94,8 +94,9 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 src_unpack() {
-	if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
-		use win64 && die "you need gcc-4.4+ to build 64bit wine"
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
@@ -165,7 +166,7 @@ src_configure() {
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
 
-	if use win64 && use amd64 ; then
+	if use win64 ; then
 		do_configure 64 --enable-win64
 		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
 	else
diff --git a/app-emulation/wine/wine-1.3.2.ebuild b/app-emulation/wine/wine-1.3.2.ebuild
index 2f208f5e21b0..29c0b96142ba 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.1 2010/09/06 20:38:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.2.ebuild,v 1.2 2010/09/07 17:10:15 vapier Exp $
 
 EAPI="2"
 
@@ -94,8 +94,9 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 src_unpack() {
-	if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
-		use win64 && die "you need gcc-4.4+ to build 64bit wine"
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
@@ -165,7 +166,7 @@ src_configure() {
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
 
-	if use win64 && use amd64 ; then
+	if use win64 ; then
 		do_configure 64 --enable-win64
 		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
 	else
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 58add8808dac..e08ee80ce65a 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.58 2010/08/06 20:54:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.59 2010/09/07 17:10:15 vapier Exp $
 
 EAPI="2"
 
@@ -94,8 +94,9 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 src_unpack() {
-	if [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] ; then
-		use win64 && die "you need gcc-4.4+ to build 64bit wine"
+	if use win64 ; then
+		[[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+			&& die "you need gcc-4.4+ to build 64bit wine"
 	fi
 
 	if [[ ${PV} == "9999" ]] ; then
@@ -165,7 +166,7 @@ src_configure() {
 	export LDCONFIG=/bin/true
 	use custom-cflags || strip-flags
 
-	if use win64 && use amd64 ; then
+	if use win64 ; then
 		do_configure 64 --enable-win64
 		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
 	else