Grab patch from upstream for amd64 build fix #129557 by Andrew Dorney.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 53 insertions, 12 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index f092a4357776..0319a92638b8 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # 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.137 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.138 2006/04/14 23:31:23 vapier Exp $
+
+  14 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/wine-0.9.11-winegcc-short-libnames.patch, wine-0.9.11.ebuild:
+  Grab patch from upstream for amd64 build fix #129557 by Andrew Dorney.
 
   02 Apr 2006; Mike Frysinger <vapier@gentoo.org> wine-0.9.ebuild,
   wine-0.9.1.ebuild, wine-0.9.2.ebuild, wine-0.9.3.ebuild,
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3cb499b27c3c..31c23fafd821 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fd1067c44e16d3adf464443fbf37e51a ChangeLog 25752
-RMD160 0fa256447140e6740d0fd95e32ea357dd054a34a ChangeLog 25752
-SHA256 ee5268f9efa97fb5c3cf7e93d08f1eac0e2e982add647fc03e4b2b057e94ded0 ChangeLog 25752
+MD5 f9fbd73e82a074d84ff516ba8c0d1d6c ChangeLog 25947
+RMD160 09d6975f374a08217a363017dff4d19517f74cbe ChangeLog 25947
+SHA256 daec6a4d88645f0012f8109be25443c2c83b8bbb9d0ccdbbc914ac616f63449d ChangeLog 25947
 MD5 fb8724a36ec3bef0ad3a3c36376b786a files/digest-wine-0.9 63
 RMD160 e2e2e9e410345effc5472930c8dff010b8cb1116 files/digest-wine-0.9 63
 SHA256 05a0841e1f0afa0af868b58819bc9a64e00cab9e6817034a5c93dc4c273b161d files/digest-wine-0.9 63
@@ -73,6 +73,9 @@ SHA256 1d283e7d0416190cf8970beaeb60c0c0d61a661daa605d39c01cca796056546c files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-wine-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-wine-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-wine-9999 0
+MD5 f2e32119ddbbdcf76c301ea636f4c9cf files/wine-0.9.11-winegcc-short-libnames.patch 1071
+RMD160 9780a5f582e68a155ba8292d588cf25825147ead files/wine-0.9.11-winegcc-short-libnames.patch 1071
+SHA256 de19af1f6cc1b24e87b169104839e78c882992ab7da01ec7006f3dc78e204d72 files/wine-0.9.11-winegcc-short-libnames.patch 1071
 MD5 491474e73029992d0fd9b888d0d1b4ce files/wine-0.9.4-null-thread-check.patch 878
 RMD160 5939406b54a3f1552eb84caf873d5793554ad95d files/wine-0.9.4-null-thread-check.patch 878
 SHA256 1de54bb6eb8cc3c3f15ea42f916605fa151a5c33ef8c0cdb3412c0d81bbf9dab files/wine-0.9.4-null-thread-check.patch 878
@@ -133,9 +136,9 @@ SHA256 1e938dc1fa681a24126e5aa334dc73e3a02a5410781bbea641d5fbf0ca61401e wine-0.9
 MD5 1ecfc5fed64aebe42b95c70761331a6d wine-0.9.10.ebuild 3489
 RMD160 dc1a22106793861ad2036385fa021ca9dd684366 wine-0.9.10.ebuild 3489
 SHA256 b9cd6ccaaed8d78f57894cf675a43a33e3eb9c64c31a4c38622bbda05137b5b9 wine-0.9.10.ebuild 3489
-MD5 077640101d794f54377217482e820b07 wine-0.9.11.ebuild 3504
-RMD160 c97c9016e872bfba22cdb98320c5cacc07982117 wine-0.9.11.ebuild 3504
-SHA256 d35ea54f4817daccbd93508e82b29037bc192e4da13c166cc61f1fd15182d7af wine-0.9.11.ebuild 3504
+MD5 0255c8689ab8318c63d22c0f4bbd379d wine-0.9.11.ebuild 3568
+RMD160 c3c8bd1b737c86356bd27bd7bcf3fb19b01f9f88 wine-0.9.11.ebuild 3568
+SHA256 d569beed9f2ebdc6baff72538d187ec41910d461d6fec9512661c649a24f33ba wine-0.9.11.ebuild 3568
 MD5 0e8a939a0799b82181ee17f084caf7eb wine-0.9.2.ebuild 4161
 RMD160 32af02785815020bd693318786246cd46ea8107b wine-0.9.2.ebuild 4161
 SHA256 aa516a61dd7eaa622a5b0e8cd74646371371f13a2118cf6989f88eb7a75e2268 wine-0.9.2.ebuild 4161
@@ -199,7 +202,7 @@ SHA256 e08dfbc889806d6eb63eda6d255f29afb2921123703cd04682533e817f60e182 wine-999
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEPCa02+ySkm8kpY0RAqriAJ94Jx93/BNg9LnqM76aNK8M8vCcWQCeORoZ
-F5hmHC8XFLEignLp+opQWr0=
-=82es
+iD8DBQFEQDD12+ySkm8kpY0RAkrOAJ9JgNgClq+hOqnDtUmoeoE4mqKK0wCeNfSq
+tiN3u+ScH+e94h20Ic3Pdzc=
+=BGvs
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/wine/files/wine-0.9.11-winegcc-short-libnames.patch b/app-emulation/wine/files/wine-0.9.11-winegcc-short-libnames.patch
new file mode 100644
index 000000000000..290264925bbd
--- /dev/null
+++ b/app-emulation/wine/files/wine-0.9.11-winegcc-short-libnames.patch
@@ -0,0 +1,33 @@
+2006-04-04  Alexandre Julliard <julliard@winehq.org>
+
+	* tools/winegcc/winegcc.c:
+	winegcc: Don't use the library full name for .so libs.
+
+Index: tools/winegcc/winegcc.c
+===================================================================
+RCS file: /home/wine/wine/tools/winegcc/winegcc.c,v
+retrieving revision 1.50
+retrieving revision 1.51
+diff -u -p -r1.50 -r1.51
+--- tools/winegcc/winegcc.c	16 Mar 2006 20:41:40 -0000	1.50
++++ tools/winegcc/winegcc.c	4 Apr 2006 21:16:14 -0000	1.51
+@@ -401,8 +401,6 @@ static void add_library( strarray *lib_d
+         }
+         break;
+     case file_so:
+-        strarray_add(files, strmake("-s%s", fullname));
+-        break;
+     default:
+         /* keep it anyway, the linker may know what to do with it */
+         strarray_add(files, strmake("-l%s", library));
+@@ -628,9 +626,9 @@ static void build(struct options* opts)
+ 	switch(files->base[j][1])
+ 	{
+ 	    case 'l':
++	    case 's':
+ 		strarray_add(link_args, strmake("-l%s", name));
+ 		break;
+-	    case 's':
+ 	    case 'a':
+ 	    case 'o':
+ 		strarray_add(link_args, name);
diff --git a/app-emulation/wine/wine-0.9.11.ebuild b/app-emulation/wine/wine-0.9.11.ebuild
index 1947e3a85a33..99efd3902519 100644
--- a/app-emulation/wine/wine-0.9.11.ebuild
+++ b/app-emulation/wine/wine-0.9.11.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.11.ebuild,v 1.5 2006/04/11 21:58:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.11.ebuild,v 1.6 2006/04/14 23:31:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/wine-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="-* -amd64 ~x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa arts cups debug esd gif glut jack jpeg lcms ldap nas ncurses opengl oss scanner truetype xml X"
 RESTRICT="test" #72375
 
@@ -70,6 +70,7 @@ src_unpack() {
 	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in
 	epatch "${FILESDIR}"/wine-gentoo-no-ssp.patch #66002
 	sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+	epatch "${FILESDIR}"/${P}-winegcc-short-libnames.patch #129557
 }
 
 config_cache() {