Applied patch to fix bug #117368...

(Portage version: 2.1-r2)

4 files changed, 121 insertions, 5 deletions

diff --git a/app-laptop/smcinit/ChangeLog b/app-laptop/smcinit/ChangeLog
index 3a4a87d94cac..84496fd78777 100644
--- a/app-laptop/smcinit/ChangeLog
+++ b/app-laptop/smcinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-laptop/smcinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/ChangeLog,v 1.3 2005/01/01 14:48:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/ChangeLog,v 1.4 2006/08/23 13:30:26 s4t4n Exp $
+
+  23 Aug 2006; Michele Noberasco <s4t4n@gentoo.org> smcinit-0.4.ebuild:
+  Applied patch to fix long standing bug #117368. Since it the issue is
+  about package compilation, I applied the patch to current version instead
+  of creating a new revision. Hence, the package is back into ~arch.
 
   24 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> smcinit-0.4.ebuild:
   Stable for x86.
diff --git a/app-laptop/smcinit/files/digest-smcinit-0.4 b/app-laptop/smcinit/files/digest-smcinit-0.4
index 9f224b041d86..66d9d1e2dd50 100644
--- a/app-laptop/smcinit/files/digest-smcinit-0.4
+++ b/app-laptop/smcinit/files/digest-smcinit-0.4
@@ -1 +1,3 @@
 MD5 a1f1107d6bfd3a6f75c8da268e1c809e smcinit-0.4-1.tar.gz 32343
+RMD160 184289babfbadc1bd93daefa37fb0db1654bac4e smcinit-0.4-1.tar.gz 32343
+SHA256 403b4c1e5fedf113f97f6ce0beccac43b6e17c53a8e04d159022138b33810032 smcinit-0.4-1.tar.gz 32343
diff --git a/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch b/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch
new file mode 100644
index 000000000000..52d6086d4d3f
--- /dev/null
+++ b/app-laptop/smcinit/files/smcinit-0.4-pciutils-2.2.0.patch
@@ -0,0 +1,98 @@
+diff -uprN smcinit-0.4-1/smcinit.c smcinit-0.4-1-r1/smcinit.c
+--- smcinit-0.4-1/smcinit.c	2004-04-20 21:56:41.000000000 +0200
++++ smcinit-0.4-1-r1/smcinit.c	2006-01-01 18:37:40.000000000 +0100
+@@ -173,7 +173,7 @@ int set_smc(int sir_io, int fir_io, int 
+     /* setpci.c */ 
+     struct pci_access *acc;
+     struct pci_dev *dev;
+-    word twobyte;
++    u16 twobyte;
+     int i = 0;
+     int local_sir_io, local_fir_io, local_fir_irq, local_fir_dma;
+ 
+@@ -188,7 +188,7 @@ int set_smc(int sir_io, int fir_io, int 
+ 	}
+     acc = pci_alloc();
+     pci_init(acc);
+-    dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC); /* 5100 also dev 1f */
++    dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC); /* 5100 also dev 1f */
+     twobyte = pci_read_word(dev, VID);
+     if (twobyte != 0x8086) {
+ 	fprintf(stderr, "%s IO hub vendor %x not intel (0x8086)\n", PROGNAME, twobyte);
+diff -uprN smcinit-0.4-1/tosh1800-smcinit.c smcinit-0.4-1-r1/tosh1800-smcinit.c
+--- smcinit-0.4-1/tosh1800-smcinit.c	2004-04-20 21:56:41.000000000 +0200
++++ smcinit-0.4-1-r1/tosh1800-smcinit.c	2006-01-01 18:37:40.000000000 +0100
+@@ -75,8 +75,8 @@ static int _debug = 0;
+  */
+ struct port_decoding_access_info {
+     int port;
+-    byte reg;
+-    byte or_mask;
++    u8 reg;
++    u8 or_mask;
+ };
+ 
+ struct port_decoding_access_info ali1533_ports[] = {
+@@ -122,7 +122,7 @@ configure_47N227_smc_ircc(int revision, 
+ 
+ struct smc_chip_model {
+     char *name;
+-    byte version_id;
++    u8 version_id;
+     int (*config_function) (int revision, int cfgbase, int sirbase,
+                             int firbase, int dma, int irq);
+ };
+@@ -279,7 +279,7 @@ static int find_ali1533_port_access_info
+ static int print_ali1533_port_status(struct pci_dev *dev)
+ {
+     struct port_decoding_access_info *p;
+-    byte onebyte;
++    u8 onebyte;
+     int i;
+ 
+     DEBUG("printing port status");
+@@ -305,7 +305,7 @@ static int print_ali1533_port_status(str
+ static int set_ali1533_port(struct pci_dev *dev, int port, int decode)
+ {
+     struct port_decoding_access_info info;
+-    byte previousval, onebyte, and_mask;
++    u8 previousval, onebyte, and_mask;
+     int retval;
+ 
+     DEBUG_VAL("looking for port", port);
+@@ -427,7 +427,7 @@ static int configure_ali1533_smc_ports_d
+ 
+ static int configure_47N227_smc_ircc(int revision, int cfgbase, int sirbase, int firbase, int dma, int irq)
+ {
+-    byte onebyte;
++    u8 onebyte;
+     int retval;
+ 
+     /* claudiuc: revision is not used yet */
+@@ -526,7 +526,7 @@ static struct smc_chip_model *find_smc_c
+ static int
+ configure_smc_ircc(int cfgbase, int sirbase, int firbase, int dma, int irq)
+ {
+-    byte version_id, revision_id;
++    u8 version_id, revision_id;
+     struct smc_chip_model *chip_model;
+     int retval;
+ 
+diff -uprN smcinit-0.4-1/tosh2450-smcinit.c smcinit-0.4-1-r1/tosh2450-smcinit.c
+--- smcinit-0.4-1/tosh2450-smcinit.c	2004-04-20 21:56:41.000000000 +0200
++++ smcinit-0.4-1-r1/tosh2450-smcinit.c	2006-01-01 18:37:40.000000000 +0100
+@@ -58,12 +58,12 @@ int main()
+   /* setpci.c */
+   struct pci_access *acc;
+   struct pci_dev *dev;
+-  word twobyte;
++  u16 twobyte;
+   
+   acc = pci_alloc();
+   pci_init(acc);
+   
+-  dev = pci_get_dev(acc, BUS_LPC, LPC_DEV, LPC_FUNC);
++  dev = pci_get_dev(acc, 0, BUS_LPC, LPC_DEV, LPC_FUNC);
+   
+   twobyte = pci_read_word(dev,VID);
+   if (twobyte != INTEL_VID){ 
diff --git a/app-laptop/smcinit/smcinit-0.4.ebuild b/app-laptop/smcinit/smcinit-0.4.ebuild
index 4ffe7c26e2c2..8bb78ea60f66 100644
--- a/app-laptop/smcinit/smcinit-0.4.ebuild
+++ b/app-laptop/smcinit/smcinit-0.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/smcinit-0.4.ebuild,v 1.3 2005/01/01 14:48:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/smcinit-0.4.ebuild,v 1.4 2006/08/23 13:30:26 s4t4n Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -13,12 +15,21 @@ SRC_URI="mirror://sourceforge/irda/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
-DEPEND=">=sys-apps/pciutils-2.1.11-r1"
+DEPEND=">=sys-apps/pciutils-2.2.0-r1"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	#Patch for bug #117368 - compilation issues with new pciutils versions...
+	epatch ${FILESDIR}/${P}-pciutils-2.2.0.patch
+}
+
 src_compile()
 {
 	econf || die "Configuration failed"