Add support for win32 and win64 at the same time by Alexandre Borges Marcelo #296608 by Michael Weber.

2 files changed, 38 insertions, 12 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 91541629ee4d..58adf92d7861 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.316 2010/07/17 19:22:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.317 2010/07/24 04:34:37 vapier Exp $
+
+  24 Jul 2010; Mike Frysinger <vapier@gentoo.org> wine-9999.ebuild:
+  Add support for win32 and win64 at the same time by Alexandre Borges
+  Marcelo #296608 by Michael Weber.
 
 *wine-1.2 (17 Jul 2010)
 
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 4be29857d3b5..92a8691894f2 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.54 2010/06/21 19:21:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.55 2010/07/24 04:34:37 vapier Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype win64 +X xcomposite xinerama xml"
+IUSE="alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls gphoto2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +perl png samba scanner ssl test +threads +truetype +win32 +win64 +X xcomposite xinerama xml"
 RESTRICT="test" #72375
 
 RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
@@ -104,12 +104,12 @@ src_prepare() {
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
 }
 
-src_configure() {
-	export LDCONFIG=/bin/true
-
-	use custom-cflags || strip-flags
-	use amd64 && ! use win64 && multilib_toolchain_setup x86
+do_configure() {
+	local builddir="${WORKDIR}/wine$1"
+	mkdir -p "${builddir}"
+	pushd "${builddir}" >/dev/null
 
+	ECONF_SOURCE=${S} \
 	econf \
 		--sysconfdir=/etc/wine \
 		$(use_with alsa) \
@@ -137,23 +137,45 @@ src_configure() {
 		$(use_with scanner sane) \
 		$(use_enable test tests) \
 		$(use_with truetype freetype) \
-		$(use_enable win64) \
 		$(use_with X x) \
 		$(use_with xcomposite) \
 		$(use_with xinerama) \
 		$(use_with xml) \
 		$(use_with xml xslt) \
-		|| die "configure failed"
+		$2
 
 	emake -j1 depend || die "depend"
+
+	popd >/dev/null
+}
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	if use win64 && use amd64 ; then
+		do_configure 64 --enable-win64
+		use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+	else
+		do_configure 32 --disable-win64
+	fi
 }
 
 src_compile() {
-	emake all || die "all"
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" all || die
+	done
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	local b
+	for b in 64 32 ; do
+		local builddir="${WORKDIR}/wine${b}"
+		[[ -d ${builddir} ]] || continue
+		emake -C "${builddir}" install DESTDIR="${D}" || die
+	done
 	dodoc ANNOUNCE AUTHORS README
 	if use gecko ; then
 		insinto /usr/share/wine/gecko