Base ifdef on __sparc__ rather than __sparc64__. The issue happens on 64-bit kernel/32-bit userland, so sparc64 isn't defined when building the userland.

Package-Manager: portage-2.1.2_pre1

3 files changed, 15 insertions, 10 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 0c74887fe2fc..8d13a27a1a3f 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.171 2006/09/20 17:24:28 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.172 2006/09/20 22:10:31 dberkholz Exp $
+
+  20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  files/1.1.1-sparc64-ati-lockups.patch:
+  Base ifdef on __sparc__ rather than __sparc64__. The issue happens on 64-bit
+  kernel/32-bit userland, so sparc64 isn't defined when building the userland.
 
   20 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   xorg-server-1.1.1-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 3b141e4c5261..5fe40cb292c8 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -50,10 +50,10 @@ AUX 1.1.1-fix-xrandr-zoom-keys.patch 6332 RMD160 cec1b86e0a6ea88e1e65543046fd1b9
 MD5 919801a6a806a9cf93777ee8bb4367bc files/1.1.1-fix-xrandr-zoom-keys.patch 6332
 RMD160 cec1b86e0a6ea88e1e65543046fd1b91ab112b04 files/1.1.1-fix-xrandr-zoom-keys.patch 6332
 SHA256 b7bb87d2170f2dd369a8b3a496dae0e93792419ccc7c78449e9affc8f07650ac files/1.1.1-fix-xrandr-zoom-keys.patch 6332
-AUX 1.1.1-sparc64-ati-lockups.patch 654 RMD160 f0aab64be9a81a95eb5c2e19519c209e4b69424f SHA1 483c989b8ec77c2c041b2a9fe39ffc89d249b866 SHA256 18d232faf393bc6796c60f137ee5507858b8f7d86a9f39a21ff062c4e01dba6d
-MD5 2d2d0df0c9831717eeee6d447f41850b files/1.1.1-sparc64-ati-lockups.patch 654
-RMD160 f0aab64be9a81a95eb5c2e19519c209e4b69424f files/1.1.1-sparc64-ati-lockups.patch 654
-SHA256 18d232faf393bc6796c60f137ee5507858b8f7d86a9f39a21ff062c4e01dba6d files/1.1.1-sparc64-ati-lockups.patch 654
+AUX 1.1.1-sparc64-ati-lockups.patch 652 RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 SHA1 31f3b422d4dc621a7638cf4f9b388ce6a5cccec4 SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51
+MD5 b20d4cd92f74e0722b9cf2e5f0704655 files/1.1.1-sparc64-ati-lockups.patch 652
+RMD160 7d642aa1c0153a4c48b8d2338b1afafdbc130852 files/1.1.1-sparc64-ati-lockups.patch 652
+SHA256 0db8886c157b253449057865c938b63aa8a4f11d746e5df4ed2a12b75d718c51 files/1.1.1-sparc64-ati-lockups.patch 652
 AUX CVE-2006-1526-xrender-mitri.patch 819 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b SHA1 fe760840ec4d6023f713f9b79b745c7822a37828 SHA256 1558fcaf5f1f6050c6a38023bc4effd8802320c2c6b3c146f19ceb8beb2d367b
 MD5 c51e1f359e9008bd496173a013866343 files/CVE-2006-1526-xrender-mitri.patch 819
 RMD160 ab993ffd54ec143755f00a2cfc526253fdb7230b files/CVE-2006-1526-xrender-mitri.patch 819
@@ -129,10 +129,10 @@ EBUILD xorg-server-1.1.1.ebuild 15408 RMD160 ed2381330df15edef870a52313ee2aa167e
 MD5 af931374df1d11bfe23c4724facf5375 xorg-server-1.1.1.ebuild 15408
 RMD160 ed2381330df15edef870a52313ee2aa167e08b97 xorg-server-1.1.1.ebuild 15408
 SHA256 f8825f43ce993ebc0567d28d4f39bc11a6b3cba9a4436a489c0f527bac6b0f8c xorg-server-1.1.1.ebuild 15408
-MISC ChangeLog 35315 RMD160 7c5e1ee348c40b5e240f49a648a01b75ff6b48af SHA1 53a5f9c81b100e6edf5d94291be480776d8e67e5 SHA256 40d586bd98f7519f913a40f7ce4d002cfcbed30fb6070474f12de4a76a55ce51
-MD5 2f21a8eec38f85cfb4e2d8dd4cbb3347 ChangeLog 35315
-RMD160 7c5e1ee348c40b5e240f49a648a01b75ff6b48af ChangeLog 35315
-SHA256 40d586bd98f7519f913a40f7ce4d002cfcbed30fb6070474f12de4a76a55ce51 ChangeLog 35315
+MISC ChangeLog 35570 RMD160 2fdbacc8e8d18dab1882bd2735f6177d8bf993dc SHA1 87b98d8ae42b5bba75f3350e23e939180bcf65ef SHA256 2169fa21a44d2de361f79fd9e485b04c5108c1b90b6d4a9058ccdf3ebb11ea0e
+MD5 94ef8ef345150add344458a97b000ff9 ChangeLog 35570
+RMD160 2fdbacc8e8d18dab1882bd2735f6177d8bf993dc ChangeLog 35570
+SHA256 2169fa21a44d2de361f79fd9e485b04c5108c1b90b6d4a9058ccdf3ebb11ea0e ChangeLog 35570
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch b/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch
index ba19b239a83b..d44d9699b2d7 100644
--- a/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch
+++ b/x11-base/xorg-server/files/1.1.1-sparc64-ati-lockups.patch
@@ -8,7 +8,7 @@ index a3c07f3..a97e6f0 100644
  /* pciAddrHostToBus */	pciAddrNOOP,
 +/* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree
 + * makes it all moot, so we kludge it for now */
-+#if defined(__sparc64__)
++#if defined(__sparc__)
 +/* pciAddrBusToHost */  pciAddrNOOP,
 +#else
  /* pciAddrBusToHost */	linuxTransAddrBusToHost,