tweak 32bit support on amd64 #96863

Package-Manager: portage-2.0.51.22-r1

5 files changed, 75 insertions, 67 deletions

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 943c24ee547e..06bd197e2f68 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,30 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 46ec54a1a64b08144e5df5336c194a8d wine-20050211.ebuild 3648
-MD5 883a96c221a159b1d30401e709a5309b wine-20050524.ebuild 3608
-MD5 f1450e62ca43f28715c815b798328495 wine-20041019-r3.ebuild 2965
-MD5 595535cc84fd1dc3a60f1cdecf065a1b wine-20050419.ebuild 3598
-MD5 2d23a2451ab77e9c7a5c79401c9f9ca0 wine-20050310-r1.ebuild 3664
+MD5 2954e9f640f993ad04e4a3fa094bce9a wine-20050211.ebuild 3673
 MD5 9de2b382311814e8a2bc148379f0f502 wine-20050111-r1.ebuild 3168
-MD5 7f6eea6374149cc338a12b6640aa9a43 ChangeLog 17378
 MD5 6525c48ba09d08599432ea6c299e52f4 metadata.xml 354
-MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
+MD5 5526ffd1bdc814e499f05ddb4251add0 wine-20050419.ebuild 3623
+MD5 f1450e62ca43f28715c815b798328495 wine-20041019-r3.ebuild 2965
+MD5 7f6eea6374149cc338a12b6640aa9a43 ChangeLog 17378
+MD5 1ccfddfc2b33b98ebcf62f51575d1b0b wine-20050524.ebuild 3633
+MD5 0a05ee533cd2a958e83fe604deab882d wine-20050310-r1.ebuild 3689
+MD5 9d19cae37895df966e850d3054ef2513 files/digest-wine-20050419 67
+MD5 8028af5342611d0521183f95342f787a files/digest-wine-20050111-r1 67
 MD5 7a55fde5c2def5d2925fab4955433c2c files/wine-20050524-alsa-headers.patch 669
-MD5 23ff2a3980929ae4a6f02161bd875b55 files/digest-wine-20041019-r3 67
+MD5 67846279ad436d5d70d0857d29c5fabf files/20050211-docs.patch 719
 MD5 32c5bd022b8547d02b07517dd7a9bc02 files/wine-20050111-upstream-registry-fix.patch.bz2 13584
-MD5 d9e9a2cb6521b07ace7e7c142679b85b files/20041019-no-stack.patch 257
 MD5 fe364ce26a93f838a04f30b274df034c files/digest-wine-20050211 67
-MD5 9d19cae37895df966e850d3054ef2513 files/digest-wine-20050419 67
+MD5 23ff2a3980929ae4a6f02161bd875b55 files/digest-wine-20041019-r3 67
+MD5 d9e9a2cb6521b07ace7e7c142679b85b files/20041019-no-stack.patch 257
 MD5 f9ded3113cb95a488a47c43fcd71467b files/digest-wine-20050524 67
-MD5 8028af5342611d0521183f95342f787a files/digest-wine-20050111-r1 67
 MD5 03f968d969bdc86d7afd384b026aa7cf files/digest-wine-20050310-r1 67
+MD5 1668a758aa2007cb99a773b3c5c844c9 files/winearts-kdecvs-fix.patch 325
 MD5 45243901331840c35f12426a17b31bd2 files/wine-20050310-upstream-colortable.patch 1546
-MD5 67846279ad436d5d70d0857d29c5fabf files/20050211-docs.patch 719
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCzJoyBXaUFmZvwyMRAvjpAJsHmmgcwTj3QHznPt/W9C2dYBjXNQCg0Dxw
-RZHqpQV/iotNp3g3sjPH9vo=
-=Z8AY
+iD8DBQFC0J1YgIKl8Uu19MoRAmAMAJ93/C385OY5MwOzlt3zy+WMlVSh4gCfZW/i
+ZDqGyMbq7BLPqAtV4NXtmpg=
+=d6LT
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-20050211.ebuild b/app-emulation/wine/wine-20050211.ebuild
index 6a46940df069..52c99085d673 100644
--- a/app-emulation/wine/wine-20050211.ebuild
+++ b/app-emulation/wine/wine-20050211.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.11 2005/06/17 02:06:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.12 2005/07/10 03:59:17 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,12 +39,20 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 pkg_setup() {
-	if use amd64 && ! has_m32 ; then
-		eerror "Your compiler seems to be unable to compile 32bit code."
-		eerror "Make sure you compile gcc with:"
-		echo
-		eerror "    USE=multilib FEATURES=-sandbox"
-		die "Cannot produce 32bit code"
+	if use amd64 ; then
+		if ! has_m32 ; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "Make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit code"
+		fi
+		if has_multilib_profile ; then
+			export ABI=x86
+		else
+			append-flags -m32
+			append-ldflags -m32
+		fi
 	fi
 }
 
@@ -85,12 +93,6 @@ src_compile() {
 	strip-flags
 	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
-	if use amd64 ; then
-		[[ -n $(get_abi_var) ]] \
-			&& export ABI=x86 \
-			|| append-flags -m32
-	fi
-
 	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 		export DB2PDF=true
 		export DB2PS=true
diff --git a/app-emulation/wine/wine-20050310-r1.ebuild b/app-emulation/wine/wine-20050310-r1.ebuild
index ed9ca21e0297..c2933f5f5354 100644
--- a/app-emulation/wine/wine-20050310-r1.ebuild
+++ b/app-emulation/wine/wine-20050310-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.4 2005/06/17 02:06:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.5 2005/07/10 03:59:17 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,12 +39,20 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 pkg_setup() {
-	if use amd64 && ! has_m32 ; then
-		eerror "Your compiler seems to be unable to compile 32bit code."
-		eerror "Make sure you compile gcc with:"
-		echo
-		eerror "    USE=multilib FEATURES=-sandbox"
-		die "Cannot produce 32bit code"
+	if use amd64 ; then
+		if ! has_m32 ; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "Make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit code"
+		fi
+		if has_multilib_profile ; then
+			export ABI=x86
+		else
+			append-flags -m32
+			append-ldflags -m32
+		fi
 	fi
 }
 
@@ -84,12 +92,6 @@ src_compile() {
 	strip-flags
 	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
-	if use amd64 ; then
-		[[ -n $(get_abi_var) ]] \
-			&& export ABI=x86 \
-			|| append-flags -m32
-	fi
-
 	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 		export DB2PDF=true
 		export DB2PS=true
diff --git a/app-emulation/wine/wine-20050419.ebuild b/app-emulation/wine/wine-20050419.ebuild
index 7b626b023325..22707855acb3 100644
--- a/app-emulation/wine/wine-20050419.ebuild
+++ b/app-emulation/wine/wine-20050419.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.6 2005/06/17 02:06:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.7 2005/07/10 03:59:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -39,12 +39,20 @@ DEPEND="${RDEPEND}
 	sys-devel/flex"
 
 pkg_setup() {
-	if use amd64 && ! has_m32 ; then
-		eerror "Your compiler seems to be unable to compile 32bit code."
-		eerror "Make sure you compile gcc with:"
-		echo
-		eerror "    USE=multilib FEATURES=-sandbox"
-		die "Cannot produce 32bit code"
+	if use amd64 ; then
+		if ! has_m32 ; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "Make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit code"
+		fi
+		if has_multilib_profile ; then
+			export ABI=x86
+		else
+			append-flags -m32
+			append-ldflags -m32
+		fi
 	fi
 }
 
@@ -83,12 +91,6 @@ src_compile() {
 	strip-flags
 	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
-	if use amd64 ; then
-		[[ -n $(get_abi_var) ]] \
-			&& export ABI=x86 \
-			|| append-flags -m32
-	fi
-
 	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 		export DB2PDF=true
 		export DB2PS=true
diff --git a/app-emulation/wine/wine-20050524.ebuild b/app-emulation/wine/wine-20050524.ebuild
index fd7e50819084..d059c0103e22 100644
--- a/app-emulation/wine/wine-20050524.ebuild
+++ b/app-emulation/wine/wine-20050524.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.4 2005/06/17 02:06:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.5 2005/07/10 03:59:17 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -39,12 +39,20 @@ DEPEND="${RDEPEND}
 #	doc? ( app-text/docbook-sgml-utils app-text/jadetex )
 
 pkg_setup() {
-	if use amd64 && ! has_m32 ; then
-		eerror "Your compiler seems to be unable to compile 32bit code."
-		eerror "Make sure you compile gcc with:"
-		echo
-		eerror "    USE=multilib FEATURES=-sandbox"
-		die "Cannot produce 32bit code"
+	if use amd64 ; then
+		if ! has_m32 ; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "Make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit code"
+		fi
+		if has_multilib_profile ; then
+			export ABI=x86
+		else
+			append-flags -m32
+			append-ldflags -m32
+		fi
 	fi
 }
 
@@ -83,12 +91,6 @@ src_compile() {
 	strip-flags
 	use lcms && append-flags -I"${ROOT}"/usr/include/lcms
 
-	if use amd64 ; then
-		[[ -n $(get_abi_var) ]] \
-			&& export ABI=x86 \
-			|| append-flags -m32
-	fi
-
 #	if ! built_with_use app-text/docbook-sgml-utils tetex ; then
 #		export DB2PDF=true
 #		export DB2PS=true