From 1cb7dbfc76cce450fa6dc599d1dd0b6aede3bfca Mon Sep 17 00:00:00 2001
From: Joseph Jezak <josejx@gentoo.org>
Date: Mon, 17 Oct 2005 18:54:14 +0000
Subject: [PATCH] Added word/byte type fix for new pciutils. Package-Manager:
 portage-2.0.53_rc5

---
 x11-misc/Xorgautoconfig/ChangeLog             |  6 +++-
 x11-misc/Xorgautoconfig/Manifest              | 13 +++++----
 .../Xorgautoconfig-0.2.1.ebuild               |  5 ++--
 x11-misc/Xorgautoconfig/files/pciutils.patch  | 29 +++++++++++++++++++
 4 files changed, 44 insertions(+), 9 deletions(-)
 create mode 100644 x11-misc/Xorgautoconfig/files/pciutils.patch

diff --git a/x11-misc/Xorgautoconfig/ChangeLog b/x11-misc/Xorgautoconfig/ChangeLog
index 0bb101171e3d..ff7fdb0a8833 100644
--- a/x11-misc/Xorgautoconfig/ChangeLog
+++ b/x11-misc/Xorgautoconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/Xorgautoconfig
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/Xorgautoconfig/ChangeLog,v 1.5 2005/10/02 16:27:35 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/Xorgautoconfig/ChangeLog,v 1.6 2005/10/17 18:54:14 josejx Exp $
+
+  17 Oct 2005; Joseph Jezak <josejx@gentoo.org> +files/pciutils.patch,
+  Xorgautoconfig-0.2.1.ebuild:
+  Added word/byte type fix for new pciutils.
 
   02 Oct 2005; Joseph Jezak <josejx@gentoo.org> Xorgautoconfig-0.2.1.ebuild:
   Marked ppc stable.
diff --git a/x11-misc/Xorgautoconfig/Manifest b/x11-misc/Xorgautoconfig/Manifest
index 38473bb7513c..acbbe4e56fde 100644
--- a/x11-misc/Xorgautoconfig/Manifest
+++ b/x11-misc/Xorgautoconfig/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4bf290a7ffd834a21ba0d98db3e3f737 ChangeLog 847
+MD5 9592c112f67b0ff396a46e8cab5b7ffd ChangeLog 995
+MD5 3ff5fe24415a2fabf741e42e494c1259 Xorgautoconfig-0.2.1.ebuild 871
 MD5 7bf9db274cb3f4499f7010b44d60954f Xorgautoconfig-0.2.ebuild 827
-MD5 48169cd3f60d9ce3ade2ef3a03c92da6 metadata.xml 341
-MD5 54e9bcdafd79739e9c7211c05badc0d5 Xorgautoconfig-0.2.1.ebuild 829
 MD5 2acd791c33364e32f005276d651f92bf files/digest-Xorgautoconfig-0.2 70
 MD5 70ed740b857fe2a2fad9c599bc6b3f56 files/digest-Xorgautoconfig-0.2.1 72
+MD5 5e3b07e8a8033524f7df96c02d7d166b files/pciutils.patch 648
+MD5 48169cd3f60d9ce3ade2ef3a03c92da6 metadata.xml 341
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDQApZcsIHjyDViGQRAoLWAKDXvbf0IiNkrMI5eP5MTmo/svyooQCeP2wM
-0XzKXw12MZ9pQ+grsfVnLSw=
-=1x4V
+iD8DBQFDU/N2csIHjyDViGQRAosoAJ48Burb4ak9fXCcKhVaPqlZfnahTgCghpek
+szeWBaGa4WyrYJSIvRBwsyE=
+=gjUk
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.1.ebuild b/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.1.ebuild
index 85c810653d83..6bed62b65e14 100644
--- a/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.1.ebuild
+++ b/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.1.ebuild,v 1.2 2005/10/02 16:27:35 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.1.ebuild,v 1.3 2005/10/17 18:54:14 josejx Exp $
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Xorgautconfig generates xorg.conf files for PPC based computers."
 HOMEPAGE="http://ppc.gentoo.org"
@@ -19,6 +19,7 @@ RDEPEND="sys-apps/pciutils"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/pciutils.patch
 	sed -i -e "/^CC=/s:gcc:$(tc-getCC):" Makefile || die "Can't replace CC"
 }
 
diff --git a/x11-misc/Xorgautoconfig/files/pciutils.patch b/x11-misc/Xorgautoconfig/files/pciutils.patch
new file mode 100644
index 000000000000..37d577a02494
--- /dev/null
+++ b/x11-misc/Xorgautoconfig/files/pciutils.patch
@@ -0,0 +1,29 @@
+--- pci.c	2005-07-20 16:12:35.000000000 -0400
++++ /usr/local/cvs/gentoo-src/Xorgautoconfig/pci.c	2005-10-17 14:15:29.000000000 -0400
+@@ -24,7 +24,7 @@
+   struct device *next;
+   struct pci_dev *dev;
+   unsigned int config_cnt;
+-  byte config[256];
++  u8 config[256];
+ };
+ 
+ struct device *first_dev;
+@@ -67,7 +67,7 @@
+       }
+ }
+ 
+-word get_conf_word(struct device *d, unsigned int pos)
++u16 get_conf_word(struct device *d, unsigned int pos)
+ {
+   return d->config[pos] | (d->config[pos+1] << 8);
+ }
+@@ -76,7 +76,7 @@
+ {
+   struct device *d;
+   struct pci_dev *p;
+-  word w;
++  u16 w;
+   
+   pacc = pci_alloc();
+   pci_filter_init(pacc, &filter);
-- 
2.26.2