summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-08-06 20:54:45 +0000
committerMike Frysinger <vapier@gentoo.org>2010-08-06 20:54:45 +0000
commit4a34e882a5303df0f7e4f2e11af17ce5f5900b55 (patch)
tree8d24740438c5296541c28ea52e4d53ac98d95ebb /app-emulation
parentWhitespace. (diff)
downloadhistorical-4a34e882a5303df0f7e4f2e11af17ce5f5900b55.tar.gz
historical-4a34e882a5303df0f7e4f2e11af17ce5f5900b55.tar.bz2
historical-4a34e882a5303df0f7e4f2e11af17ce5f5900b55.zip
Set ABI to x86 when building win32 only #331269 by ferret.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/wine/ChangeLog6
-rw-r--r--app-emulation/wine/Manifest12
-rw-r--r--app-emulation/wine/wine-1.3.0.ebuild4
-rw-r--r--app-emulation/wine/wine-9999.ebuild4
4 files changed, 15 insertions, 11 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index b9ae7ccc648b..5ee7c148e4c8 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.320 2010/08/03 18:43:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.321 2010/08/06 20:54:45 vapier Exp $
+
+ 06 Aug 2010; Mike Frysinger <vapier@gentoo.org> wine-1.3.0.ebuild,
+ wine-9999.ebuild:
+ Set ABI to x86 when building win32 only #331269 by ferret.
03 Aug 2010; Mike Frysinger <vapier@gentoo.org> wine-1.3.0.ebuild,
wine-9999.ebuild:
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index a54b2a0e24e6..6fc0df9f86c9 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -112,14 +112,14 @@ 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 4999 RMD160 d31c8964752fcda5a4bcfcc5c6682d1e63612a86 SHA1 86cddd1c052915d8cccd0f5afaa6ec61b8ea0d51 SHA256 4bf6c532a8cffbb767f2b2d661ad53f3c3cd2073a4192b1e7268e2eaaaa85c78
-EBUILD wine-1.3.0.ebuild 5539 RMD160 c48f20e6a8060f462dd6282d85d1a046aa5666da SHA1 8123b9ae562677b798e6e6dfb8895b68117f5192 SHA256 7df36e054ce115f2a52ebb69845e0dc3b6b659f073901ac2df0e7cf12956005d
-EBUILD wine-9999.ebuild 5539 RMD160 02964948225ac4f0e7b4b47978b91567edd31197 SHA1 5aa8d88305084971a8df10ad36bba518b838a11d SHA256 53af6a7ac33675cdbb820908468c9e342a9f712aba0a1531c382440a0701ef82
-MISC ChangeLog 60281 RMD160 df4539aa873b13dcb68434580df984d4855290e9 SHA1 1a4b9de9dcd7c7b25d3c44bc4cced4b3f0ec64e8 SHA256 a5bff6d45fa409ac5b09e033d6356530e6364405d2454da5c679f30190bba2ac
+EBUILD wine-1.3.0.ebuild 5547 RMD160 ddb7b6f074bad0b520bbe32f9d47ba756605e907 SHA1 ed77a3f79b9a59225dddda62b2e5526d628be9f6 SHA256 ab274e8afa94feb3ce7a2643c378f7cd2317e1da3013abf1c6b4ea80d61d247b
+EBUILD wine-9999.ebuild 5547 RMD160 485274152888ab5646976be7ed479307970cd53a SHA1 fa0f3b1f4bebbefd677945ed4439786c7ad511b3 SHA256 ae935a2e34f96853379f895f87d62142f281178733c7165854dcfc4960639b05
+MISC ChangeLog 60432 RMD160 44fa8087503af55c2658eec5cde29ea8c76411e6 SHA1 1e365d8fd43ad8d4aef388ba0c7a7279daede02b SHA256 165e1d8acd26deb8166bcda1be95809ad3f0d912b80af2e42ef2e85caef8bfa3
MISC metadata.xml 1417 RMD160 6956a69da8c1a72542e91d63b9e194247df3b781 SHA1 0a050a0047bbd4d750b57600b6f608c7411a7d0b SHA256 dc1c6fda02c66f6edf0b3095b1edc57e3730eece0b7eb4d15e67e0daa1bc9c50
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.15 (GNU/Linux)
-iF4EAREIAAYFAkxYY2YACgkQTwhj9JtAlp78MAD9Hc9FzRoB30Z6no2uDbf5PGXr
-d31DyU2t4dr2G539BRgBAIkDttjjLnocdu/RAk4fXtcIPPgXSxp2uVnf973A7z+J
-=5tbA
+iF4EAREIAAYFAkxcds8ACgkQTwhj9JtAlp7vhgD+KundC/7SzoGhPwDRRbtgN/XJ
+nO37+awLQ9aXNMdAybMA/jORIvZ1b+C9fisTnl9IYba/k2GkJ/kpLCKwQ+QIvbc9
+=O7Pg
-----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/wine-1.3.0.ebuild b/app-emulation/wine/wine-1.3.0.ebuild
index 0d2def033ec7..e04de1f56f2b 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.2 2010/08/03 18:43:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.3.0.ebuild,v 1.3 2010/08/06 20:54:45 vapier Exp $
EAPI="2"
@@ -169,7 +169,7 @@ src_configure() {
do_configure 64 --enable-win64
use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
else
- do_configure 32 --disable-win64
+ ABI=x86 do_configure 32 --disable-win64
fi
}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 185d987f618e..58add8808dac 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.57 2010/08/03 18:43:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.58 2010/08/06 20:54:45 vapier Exp $
EAPI="2"
@@ -169,7 +169,7 @@ src_configure() {
do_configure 64 --enable-win64
use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
else
- do_configure 32 --disable-win64
+ ABI=x86 do_configure 32 --disable-win64
fi
}