From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OcWRf-0000he-5x for garchives@archives.gentoo.org; Sat, 24 Jul 2010 04:34:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EFF5E0930; Sat, 24 Jul 2010 04:34:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D770CE0930 for ; Sat, 24 Jul 2010 04:34:38 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F79C1B4033 for ; Sat, 24 Jul 2010 04:34:38 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 559) id BC1C02CE15; Sat, 24 Jul 2010 04:34:37 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/wine: ChangeLog wine-9999.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog wine-9999.ebuild X-VCS-Directories: app-emulation/wine X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20100724043437.BC1C02CE15@corvid.gentoo.org> Date: Sat, 24 Jul 2010 04:34:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d8fc4fd4-a770-4997-b8ec-c21c7354a21e X-Archives-Hash: a9a83fabdb94dc6ecbf0039c35a3b0e3 vapier 10/07/24 04:34:37 Modified: ChangeLog wine-9999.ebuild Log: Add support for win32 and win64 at the same time by Alexandre Borges Ma= rcelo #296608 by Michael Weber. Revision Changes Path 1.317 app-emulation/wine/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine= /ChangeLog?rev=3D1.317&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine= /ChangeLog?rev=3D1.317&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine= /ChangeLog?r1=3D1.316&r2=3D1.317 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- ChangeLog 17 Jul 2010 19:22:03 -0000 1.316 +++ ChangeLog 24 Jul 2010 04:34:37 -0000 1.317 @@ -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 wine-9999.ebuild: + Add support for win32 and win64 at the same time by Alexandre Borges + Marcelo #296608 by Michael Weber. =20 *wine-1.2 (17 Jul 2010) =20 1.55 app-emulation/wine/wine-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine= /wine-9999.ebuild?rev=3D1.55&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine= /wine-9999.ebuild?rev=3D1.55&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine= /wine-9999.ebuild?r1=3D1.54&r2=3D1.55 Index: wine-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- wine-9999.ebuild 21 Jun 2010 19:21:55 -0000 1.54 +++ wine-9999.ebuild 24 Jul 2010 04:34:37 -0000 1.55 @@ -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 $ =20 EAPI=3D"2" =20 @@ -26,7 +26,7 @@ =20 LICENSE=3D"LGPL-2.1" SLOT=3D"0" -IUSE=3D"alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls g= photo2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +p= erl png samba scanner ssl test +threads +truetype win64 +X xcomposite xin= erama xml" +IUSE=3D"alsa capi cups custom-cflags dbus esd fontconfig +gecko gnutls g= photo2 gsm hal jack jpeg lcms ldap mp3 nas ncurses openal +opengl +oss +p= erl png samba scanner ssl test +threads +truetype +win32 +win64 +X xcompo= site xinerama xml" RESTRICT=3D"test" #72375 =20 RDEPEND=3D"truetype? ( >=3Dmedia-libs/freetype-2.0.0 media-fonts/corefon= ts ) @@ -104,12 +104,12 @@ sed -i '/^MimeType/d' tools/wine.desktop || die #117785 } =20 -src_configure() { - export LDCONFIG=3D/bin/true - - use custom-cflags || strip-flags - use amd64 && ! use win64 && multilib_toolchain_setup x86 +do_configure() { + local builddir=3D"${WORKDIR}/wine$1" + mkdir -p "${builddir}" + pushd "${builddir}" >/dev/null =20 + ECONF_SOURCE=3D${S} \ econf \ --sysconfdir=3D/etc/wine \ $(use_with alsa) \ @@ -137,23 +137,45 @@ $(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 =20 emake -j1 depend || die "depend" + + popd >/dev/null +} +src_configure() { + export LDCONFIG=3D/bin/true + use custom-cflags || strip-flags + + if use win64 && use amd64 ; then + do_configure 64 --enable-win64 + use win32 && ABI=3Dx86 do_configure 32 --with-wine64=3D../wine64 + else + do_configure 32 --disable-win64 + fi } =20 src_compile() { - emake all || die "all" + local b + for b in 64 32 ; do + local builddir=3D"${WORKDIR}/wine${b}" + [[ -d ${builddir} ]] || continue + emake -C "${builddir}" all || die + done } =20 src_install() { - emake DESTDIR=3D"${D}" install || die + local b + for b in 64 32 ; do + local builddir=3D"${WORKDIR}/wine${b}" + [[ -d ${builddir} ]] || continue + emake -C "${builddir}" install DESTDIR=3D"${D}" || die + done dodoc ANNOUNCE AUTHORS README if use gecko ; then insinto /usr/share/wine/gecko