Add patch to deal with incompatible header changes in version 2.2.0 of pciutils.

(Portage version: 2.0.53_rc5)

5 files changed, 94 insertions, 18 deletions

diff --git a/net-irc/xchat-xsys/ChangeLog b/net-irc/xchat-xsys/ChangeLog
index 6df1c0ed1edf..8d9ff6e21d5e 100644
--- a/net-irc/xchat-xsys/ChangeLog
+++ b/net-irc/xchat-xsys/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/xchat-xsys
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.30 2005/09/29 14:11:13 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.31 2005/10/17 18:24:03 chainsaw Exp $
+
+*xchat-xsys-2.0.8-r1 (17 Oct 2005)
+
+  17 Oct 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/2.0.8-pciutils-headerchange.patch, -xchat-xsys-2.0.8.ebuild,
+  +xchat-xsys-2.0.8-r1.ebuild:
+  Add patch to deal with incompatible header changes in version 2.2.0 of
+  pciutils.
 
   29 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   xchat-xsys-2.0.8.ebuild:
diff --git a/net-irc/xchat-xsys/Manifest b/net-irc/xchat-xsys/Manifest
index 2794a0e1128c..97211c99cb4a 100644
--- a/net-irc/xchat-xsys/Manifest
+++ b/net-irc/xchat-xsys/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a4fbb0415554bad0411c7d9e777ef28d ChangeLog 5599
-MD5 42cef2da59c81f792584c3f9048a1930 metadata.xml 250
-MD5 e67b7128df0a8928c0d1021dcb77fb75 xchat-xsys-2.0.7.ebuild 1240
-MD5 b971879c0dd67f09cf96bf9d7b5b895a xchat-xsys-2.0.6-r1.ebuild 1115
-MD5 babcce479af122c66e8db32be10449d6 xchat-xsys-2.0.8.ebuild 1204
-MD5 842385c4ed19ac2862c9357e7692236b files/digest-xchat-xsys-2.0.7 62
 MD5 f0b1aadf9019a28c3ba07db0e7d4dba5 files/2.0.6-localisation.patch 357
 MD5 9265f3c810174109111187f857dfdb8f files/2.0.7-glib_version.patch 728
+MD5 1de97edb2d041cca4334dd08150c8223 files/2.0.8-pciutils-headerchange.patch 2227
 MD5 cfd00aeca2a4bbf333f23e4f44bb9feb files/digest-xchat-xsys-2.0.6-r1 62
+MD5 842385c4ed19ac2862c9357e7692236b files/digest-xchat-xsys-2.0.7 62
 MD5 449c51eef89c22687a69cacd25d18068 files/digest-xchat-xsys-2.0.8 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDO/ZFKRy60XGEcJIRAmLvAJ9e3DKqieHi+GjqvEe7MCF2ushjlgCgstx5
-ucyIe7OW2aS52zKL/WQyLYk=
-=OyUq
------END PGP SIGNATURE-----
+MD5 449c51eef89c22687a69cacd25d18068 files/digest-xchat-xsys-2.0.8-r1 62
+MD5 42cef2da59c81f792584c3f9048a1930 metadata.xml 250
+MD5 b971879c0dd67f09cf96bf9d7b5b895a xchat-xsys-2.0.6-r1.ebuild 1115
+MD5 e67b7128df0a8928c0d1021dcb77fb75 xchat-xsys-2.0.7.ebuild 1240
+MD5 bfac39291107e8b6fbe7b83f57ffdf8f xchat-xsys-2.0.8-r1.ebuild 1258
+MD5 babcce479af122c66e8db32be10449d6 xchat-xsys-2.0.8.ebuild 1204
diff --git a/net-irc/xchat-xsys/files/2.0.8-pciutils-headerchange.patch b/net-irc/xchat-xsys/files/2.0.8-pciutils-headerchange.patch
new file mode 100644
index 000000000000..94bd06cb0c22
--- /dev/null
+++ b/net-irc/xchat-xsys/files/2.0.8-pciutils-headerchange.patch
@@ -0,0 +1,74 @@
+--- xsys-2.0.8/pci.h.orig	2005-10-17 19:18:34.000000000 +0100
++++ xsys-2.0.8/pci.h	2005-10-17 19:19:17.000000000 +0100
+@@ -23,6 +23,6 @@
+ 
+ #include <pci/pci.h>
+ void pci_find_fullname(char *fullname, char *vendor, char *device);
+-int  pci_find_by_class(word *class, char *vendor, char *device);
++int  pci_find_by_class(u16 *class, char *vendor, char *device);
+ 
+ #endif
+--- xsys-2.0.8/pci.c.orig	2005-10-17 19:20:14.000000000 +0100
++++ xsys-2.0.8/pci.c	2005-10-17 19:21:47.000000000 +0100
+@@ -35,7 +35,7 @@
+   	struct device *next;
+   	struct pci_dev *dev;
+   	unsigned int config_cnt;
+-  	byte config[256];
++  	u8 config[256];
+ };
+ 
+ struct device *first_dev;
+@@ -77,12 +77,12 @@
+       	}
+ }
+ 
+-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);
+ }
+ 
+-int pci_find_by_class(word *class, char *vendor, char *device)
++int pci_find_by_class(u16 *class, char *vendor, char *device)
+ {
+ 	struct device *d;
+ 	struct pci_dev *p;
+--- xsys-2.0.8/parse.c.orig	2005-10-17 19:19:28.000000000 +0100
++++ xsys-2.0.8/parse.c	2005-10-17 19:19:58.000000000 +0100
+@@ -214,7 +214,7 @@
+ int xs_parse_sound(char *snd_card)
+ {
+ 	char buffer[bsize], cards[bsize] = "\0", vendor[7] = "\0", device[7] = "\0", *pos;
+-	word class = PCI_CLASS_MULTIMEDIA_AUDIO;
++	u16 class = PCI_CLASS_MULTIMEDIA_AUDIO;
+ 
+ 	FILE *fp = NULL;
+ 	if((fp = fopen("/proc/asound/cards", "r"))== NULL) {
+@@ -255,7 +255,7 @@
+ int xs_parse_video(char *vid_card)
+ {
+ 	char vendor[7] = "\0", device[7] = "\0";
+-	word class = PCI_CLASS_DISPLAY_VGA;
++	u16 class = PCI_CLASS_DISPLAY_VGA;
+ 	if (pci_find_by_class(&class, vendor, device))
+ 		return 1;
+ 	else
+@@ -266,7 +266,7 @@
+ int xs_parse_ether(char *ethernet_card)
+ {
+ 	char vendor[7] = "\0", device[7] = "\0";
+-	word class = PCI_CLASS_NETWORK_ETHERNET;
++	u16 class = PCI_CLASS_NETWORK_ETHERNET;
+ 	if (pci_find_by_class(&class, vendor, device))
+ 		return 1;
+ 	else
+@@ -277,7 +277,7 @@
+ int xs_parse_agpbridge(char *agp_bridge)
+ {
+ 	char vendor[7] = "\0", device[7] = "\0";
+-	word class = PCI_CLASS_BRIDGE_HOST;
++	u16 class = PCI_CLASS_BRIDGE_HOST;
+ 	if (pci_find_by_class(&class, vendor, device))
+ 		return 1;
+ 	else
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.8 b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.8-r1
index f4a3adba9914..f4a3adba9914 100644
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.8
+++ b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.8-r1
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.8.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild
index 0b405c58e187..eaac062c441f 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.8.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.8.ebuild,v 1.3 2005/09/29 14:11:13 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild,v 1.1 2005/10/17 18:24:03 chainsaw Exp $
 
 inherit toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bmp xmms buttons"
 
 DEPEND="|| (
@@ -34,6 +34,7 @@ src_unpack() {
 	elif use xmms; then
 		sed -i -e "s:# FOR XMMS # ::g" ${S}/Makefile
 	fi
+	epatch ${FILESDIR}/${PV}-pciutils-headerchange.patch
 }
 
 src_compile() {