Fixes for bug #128772.

Package-Manager: portage-2.1.1_pre1-r1

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 4329e6d6c7b30bcc8925f6e4575a1ecbff81e41e..36898ce3759757e491871932b80ea97898761652 100644 (file)
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.145 2006/06/10 22:52:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.146 2006/06/20 21:38:46 eradicator Exp $
+
+  20 Jun 2006; Jeremy Huddleston <eradicator@gentoo.org> wine-0.9.15.ebuild:
+  Fixes for bug #128772.
 
 *wine-0.9.15 (09 Jun 2006)
 

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index aa6651f89de0983174ef6f9360e3b7a306ae9abc..efbe51eb91673ea611f2e72c80a4581c05b6eb5a 100644 (file)
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wine-0.9.11-winegcc-short-libnames.patch 1071 RMD160 9780a5f582e68a155ba8292d588cf25825147ead SHA1 7f21b20b74f458c9d23114738d5c605448c091f8 SHA256 de19af1f6cc1b24e87b169104839e78c882992ab7da01ec7006f3dc78e204d72
 MD5 f2e32119ddbbdcf76c301ea636f4c9cf files/wine-0.9.11-winegcc-short-libnames.patch 1071
 RMD160 9780a5f582e68a155ba8292d588cf25825147ead files/wine-0.9.11-winegcc-short-libnames.patch 1071
@@ -121,10 +124,10 @@ EBUILD wine-0.9.14.ebuild 3504 RMD160 d5c8d844063f087c7d57546e817743ac523b2607 S
 MD5 f4529ad5ee3a65bec4e6012c1bcd9feb wine-0.9.14.ebuild 3504
 RMD160 d5c8d844063f087c7d57546e817743ac523b2607 wine-0.9.14.ebuild 3504
 SHA256 78e15296858a473a146ff83cddfd7085faa64b496995b5221fdb4969727dd6af wine-0.9.14.ebuild 3504
-EBUILD wine-0.9.15.ebuild 3509 RMD160 af1403168df3b62882e4e32edbc3195f2d23e79a SHA1 8e32e4da9783a71e75ffd1e562f88e6e8139daf1 SHA256 23977a27882f7d7db85272c03d35fd369ecdd00c5eb32540abc10df267fec72b
-MD5 608b74012192f2ea31601b2cc0101aac wine-0.9.15.ebuild 3509
-RMD160 af1403168df3b62882e4e32edbc3195f2d23e79a wine-0.9.15.ebuild 3509
-SHA256 23977a27882f7d7db85272c03d35fd369ecdd00c5eb32540abc10df267fec72b wine-0.9.15.ebuild 3509
+EBUILD wine-0.9.15.ebuild 3481 RMD160 9895c73b4fd8a2f2e4362a0108e7077457102a04 SHA1 03e24ef62d35bb45a55ddc6d1f3378ad785773df SHA256 292fabddbc7351095eb80c0e1885fc15b5024b59f1ffeeff1bf01e74bd9150a4
+MD5 08c26bb1ac997340d37420668f66f650 wine-0.9.15.ebuild 3481
+RMD160 9895c73b4fd8a2f2e4362a0108e7077457102a04 wine-0.9.15.ebuild 3481
+SHA256 292fabddbc7351095eb80c0e1885fc15b5024b59f1ffeeff1bf01e74bd9150a4 wine-0.9.15.ebuild 3481
 EBUILD wine-0.9.2.ebuild 4161 RMD160 32af02785815020bd693318786246cd46ea8107b SHA1 dd7227f031650079f361acd77b55e7b13761ee29 SHA256 aa516a61dd7eaa622a5b0e8cd74646371371f13a2118cf6989f88eb7a75e2268
 MD5 0e8a939a0799b82181ee17f084caf7eb wine-0.9.2.ebuild 4161
 RMD160 32af02785815020bd693318786246cd46ea8107b wine-0.9.2.ebuild 4161
@@ -205,10 +208,10 @@ EBUILD wine-9999.ebuild 3523 RMD160 0181971699654ce130406ef82eed75021f4951c1 SHA
 MD5 16ce84a9773603dbe63a7218befa7b79 wine-9999.ebuild 3523
 RMD160 0181971699654ce130406ef82eed75021f4951c1 wine-9999.ebuild 3523
 SHA256 e08dfbc889806d6eb63eda6d255f29afb2921123703cd04682533e817f60e182 wine-9999.ebuild 3523
-MISC ChangeLog 27067 RMD160 4986a736509c507545d208f17cd8f19796db26aa SHA1 3339fd4dec87ad460e2b9dbf4a7f520a852e9056 SHA256 8fa9fd354506b2573a86e6f0854a045690810d1e96ff7d33f60215e6cb9b82b3
-MD5 6dbe410d2cd4ac049b00ac0e6d938c93 ChangeLog 27067
-RMD160 4986a736509c507545d208f17cd8f19796db26aa ChangeLog 27067
-SHA256 8fa9fd354506b2573a86e6f0854a045690810d1e96ff7d33f60215e6cb9b82b3 ChangeLog 27067
+MISC ChangeLog 27174 RMD160 bd585180667a22aff7f6f74209de499980d97267 SHA1 a112c41e8e90e5f1e6be36efba74d2046ffe357d SHA256 a121e54588b41b71e5dc701b45992d727411f241f2b158fd65d9250f28c2df4a
+MD5 1369458e77fc2b8a7c4bdf45ecc677f5 ChangeLog 27174
+RMD160 bd585180667a22aff7f6f74209de499980d97267 ChangeLog 27174
+SHA256 a121e54588b41b71e5dc701b45992d727411f241f2b158fd65d9250f28c2df4a ChangeLog 27174
 MISC metadata.xml 791 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de SHA1 331dfb5419d6b26502b33bc4e00a2fa4b3301a1a SHA256 6ad20d106c155d738b1ac41ccdb5ee8495c42129fd53308e641414e345d7e018
 MD5 78959654c62738e9d3ff3302e974d98a metadata.xml 791
 RMD160 2c8f8f40729fde13d93730374ee39811c29c20de metadata.xml 791
@@ -294,3 +297,10 @@ SHA256 2edb31979d545665223233e38e10a531680b7726cf2b3b8fceeaae81f90bc753 files/di
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-wine-9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-wine-9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-wine-9999 1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEmGryOpjtAl+gMRURAmQKAKDAPp8wXXk/jWe5aY8vq+dbnA/HbgCghSOP
+01sgNtQJ5ySS8BwPkxy6kWs=
+=b0Ma
+-----END PGP SIGNATURE-----

diff --git a/app-emulation/wine/wine-0.9.15.ebuild b/app-emulation/wine/wine-0.9.15.ebuild
index bc0977bd37e542274e21a9b135bba135f18377d7..bef31caec17a5ff840e330f796cb263ed88e0901 100644 (file)
--- a/app-emulation/wine/wine-0.9.15.ebuild
+++ b/app-emulation/wine/wine-0.9.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.6 2006/06/15 08:03:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.7 2006/06/20 21:38:46 eradicator Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -59,9 +59,6 @@ DEPEND="${RDEPEND}
        sys-devel/bison
        sys-devel/flex"
 
-# this will not build as 64bit code     
-export ABI=x86
-
 src_unpack() {
        unpack wine-${PV}.tar.bz2
        cd "${S}"
@@ -104,9 +101,10 @@ src_compile() {
 
        strip-flags
 
+       use amd64 && multilib_toolchain_setup x86
+
        #       $(use_enable amd64 win64)
        econf \
-               CC="$(tc-getCC)" \
                --sysconfdir=/etc/wine \
                $(use_with ncurses curses) \
                $(use_with opengl) \