Add amd64 patch for 2.6.22 for fcpci only thanks to <apost1@gmx.de>, bug 190152 and 184903

Package-Manager: portage-2.1.3.7

4 files changed, 35 insertions, 11 deletions

diff --git a/net-dialup/fritzcapi/ChangeLog b/net-dialup/fritzcapi/ChangeLog
index 1043cc2edeec..ee7df6092c13 100644
--- a/net-dialup/fritzcapi/ChangeLog
+++ b/net-dialup/fritzcapi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/fritzcapi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.33 2007/07/23 19:45:10 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/ChangeLog,v 1.34 2007/08/29 18:45:40 genstef Exp $
+
+*fritzcapi-2.6.43.ebuild (29 Aug 2007)
+
+  29 Aug 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/2.6.43-linux-2.6.22-pci_module_init.patch, fritzcapi-2.6.43.ebuild:
+  Add amd64 patch for 2.6.22 for fcpci only thanks to <apost1@gmx.de>, bug
+  190152 and 184903
 
   23 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
   fritzcapi-2.6.43.ebuild:
diff --git a/net-dialup/fritzcapi/Manifest b/net-dialup/fritzcapi/Manifest
index 93b8e529d1e9..7a218811aac2 100644
--- a/net-dialup/fritzcapi/Manifest
+++ b/net-dialup/fritzcapi/Manifest
@@ -14,6 +14,10 @@ AUX 2.6.43-linux-2.6.19-irq_handler.patch 6472 RMD160 a899fc6f602b0bb988ab68aa82
 MD5 718ece9c17590750a4b13679c1302596 files/2.6.43-linux-2.6.19-irq_handler.patch 6472
 RMD160 a899fc6f602b0bb988ab68aa82c3947ca3f3b139 files/2.6.43-linux-2.6.19-irq_handler.patch 6472
 SHA256 b9df1c8677a29e25c77b65d0b219b4ddbcc373a9dd628ac0a79dfb3c1c3a57e8 files/2.6.43-linux-2.6.19-irq_handler.patch 6472
+AUX 2.6.43-linux-2.6.22-pci_module_init.patch 602 RMD160 553a37ebc0889ed396dd2ed7dae700654f8c97b7 SHA1 532f1aff414bb70b48dc93ac52c2f0e686953846 SHA256 4d42f809ff4b5777d867e270ae9e1b34d80d078813d90f2dd40e0a83190f6036
+MD5 9e54eebbbccab0e414ac3c99db8a859f files/2.6.43-linux-2.6.22-pci_module_init.patch 602
+RMD160 553a37ebc0889ed396dd2ed7dae700654f8c97b7 files/2.6.43-linux-2.6.22-pci_module_init.patch 602
+SHA256 4d42f809ff4b5777d867e270ae9e1b34d80d078813d90f2dd40e0a83190f6036 files/2.6.43-linux-2.6.22-pci_module_init.patch 602
 AUX fcusb2-2.6.19.patch 396 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 SHA1 b8fb157ce239ed250501a1ab093e8dbd51bf97a6 SHA256 67541e2783e105ce1d7ca9f4d76fff7fb1f9cb9acc74a21c9d375b40d5df01b3
 MD5 c768ffb3ac0290117fbe06c6862a2b5b files/fcusb2-2.6.19.patch 396
 RMD160 923e9cfcc98cca937cb5311db09d8c4b6d913442 files/fcusb2-2.6.19.patch 396
@@ -32,14 +36,14 @@ RMD160 9ceb93eefb5d5bc3a86017edb8b44c0ec6dcd969 files/fritzcapi-2.6.22.patch 242
 SHA256 0999d963f00d20ac7072e5e7e7dda6ca572cdb340e19fc2252b181de27d39908 files/fritzcapi-2.6.22.patch 2428
 DIST km_fritzcapi-2.6-43.i586.rpm 2991322 RMD160 a300b383d474ddf9283c1bd9fae310be196c0199 SHA1 80768055694913b706075fa03f15a7477ef29a3f SHA256 e90827d8c2b53dc475c97be8c8a018777830519592bc9e25ef1a49389d12e475
 DIST km_fritzcapi-2.6-43.x86_64.rpm 1006645 RMD160 7338380933345b211ba92654565c78cf4ad793ca SHA1 f7e5d9cf8c43db73b4e0c4fcb76753af74b6e743 SHA256 506ff28f5fd1d70969378d52d5d48f9937b585556a4a5475bbfd92865b74a860
-EBUILD fritzcapi-2.6.43.ebuild 5606 RMD160 be7e7c41b1d111f80b228a5b4bfa9f29675577f6 SHA1 f4bf40e6594aeaeaa6187006fa51cd89a5d53050 SHA256 5cade6d544b20cf3c4db122d9aad1dfac5181fd9a2f1b8412ebd48d454bdcd03
-MD5 4b20639991ac50d5833051bc75b26272 fritzcapi-2.6.43.ebuild 5606
-RMD160 be7e7c41b1d111f80b228a5b4bfa9f29675577f6 fritzcapi-2.6.43.ebuild 5606
-SHA256 5cade6d544b20cf3c4db122d9aad1dfac5181fd9a2f1b8412ebd48d454bdcd03 fritzcapi-2.6.43.ebuild 5606
-MISC ChangeLog 6264 RMD160 6f33982a44898b86904aad93897875148057ff26 SHA1 8aba07a88c806eec5a01d734a78fb92fe56a1772 SHA256 6e7de12bc8fa0ce7de803780f616efb3364c956c3d84112d68304186e110c48c
-MD5 9df742e0c0b8b2c615bbb5a35e88d264 ChangeLog 6264
-RMD160 6f33982a44898b86904aad93897875148057ff26 ChangeLog 6264
-SHA256 6e7de12bc8fa0ce7de803780f616efb3364c956c3d84112d68304186e110c48c ChangeLog 6264
+EBUILD fritzcapi-2.6.43.ebuild 5707 RMD160 3c08de4ac8499c187226d3529b53755e2b85b995 SHA1 5d96ff6e8384d9bc7b17ff8698321c0aa014c856 SHA256 e3f012e2cc2c4d0c536666f393139cd2176d681a1f00f638e2d5cd18540094bd
+MD5 04ba8982c4a995c4304379ecb8a0d8d8 fritzcapi-2.6.43.ebuild 5707
+RMD160 3c08de4ac8499c187226d3529b53755e2b85b995 fritzcapi-2.6.43.ebuild 5707
+SHA256 e3f012e2cc2c4d0c536666f393139cd2176d681a1f00f638e2d5cd18540094bd fritzcapi-2.6.43.ebuild 5707
+MISC ChangeLog 6530 RMD160 1dd0980c7201375851a39cbad02c4d2cf47e77c9 SHA1 5be758f363bed28f2cec6dbb1c7443e86238aa29 SHA256 9fc636f7e819a7267730ba5d620defd0a78ac4f07b7eb7b1cafacbd016dd9b44
+MD5 f5ee8388e5ab6a203aeb9f7764f0f748 ChangeLog 6530
+RMD160 1dd0980c7201375851a39cbad02c4d2cf47e77c9 ChangeLog 6530
+SHA256 9fc636f7e819a7267730ba5d620defd0a78ac4f07b7eb7b1cafacbd016dd9b44 ChangeLog 6530
 MISC metadata.xml 319 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 SHA1 bfea39d327ea986c5fc5e31864ce1bfeccb2f4d9 SHA256 ce891f4c7e75069036c8c422a1502ce9bbd4670be2e7f918dfa9da5e917787fc
 MD5 0498b76c69caf75c82ab7115df4cd4f8 metadata.xml 319
 RMD160 d4d008a13689fabae0994a25a60961b2fc5e6269 metadata.xml 319
diff --git a/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch
new file mode 100644
index 000000000000..6624e327ec9f
--- /dev/null
+++ b/net-dialup/fritzcapi/files/2.6.43-linux-2.6.22-pci_module_init.patch
@@ -0,0 +1,12 @@
+diff -ur usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c
+--- usr.orig/src/kernel-modules/fritzcapi/fritz.pci/src/main.c	2007-08-25 09:54:42.000000000 +0200
++++ usr/src/kernel-modules/fritzcapi/fritz.pci/src/main.c	2007-08-25 09:55:02.000000000 +0200
+@@ -364,7 +364,7 @@
+ #endif
+ 
+ #if defined (__fcpci__)	
+-	if (0 == (err = pci_module_init (&fcpci_driver))) {
++	if (0 == (err = pci_register_driver (&fcpci_driver))) {
+ 		LOG("PCI driver registered.\n");
+ 		register_capi_driver (&fritz_capi_driver);
+ 		LOG("CAPI driver registered.\n");
diff --git a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
index 56739ef542c3..85831423322e 100644
--- a/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
+++ b/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.15 2007/07/23 19:45:10 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fritzcapi/fritzcapi-2.6.43.ebuild,v 1.16 2007/08/29 18:45:40 genstef Exp $
 
 inherit linux-mod rpm eutils
 
@@ -98,7 +98,6 @@ pkg_setup() {
 src_unpack() {
 	rpm_unpack "${DISTDIR}/${A}" || die "failed to unpack ${A} file"
 
-	use x86 && epatch ${FILESDIR}/fritzcapi-2.6.22.patch
 	cd "${S}"
 	mkdir -p "${WORKDIR}/var/lib/fritz"
 	ln fritz.*/lib/*-lib.o "${WORKDIR}/var/lib/fritz"
@@ -116,10 +115,12 @@ src_unpack() {
 	  epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.patch
 	  kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.patch
 	  kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.patch
+	  kernel_is ge 2 6 22 && epatch ${FILESDIR}/fritzcapi-2.6.22.patch
 	else
 	  epatch ${FILESDIR}/2.6.43-linux-2.6.19-irq_handler.amd64.patch
 	  kernel_is ge 2 6 17 && epatch ${FILESDIR}/2.6.43-fcpcmcia.amd64.patch
 	  kernel_is ge 2 6 20 && epatch ${FILESDIR}/fritzcapi-2.6.20.amd64.patch
+	  kernel_is ge 2 6 22 && epatch ${FILESDIR}/2.6.43-linux-2.6.22-pci_module_init.patch
 	fi
 	find -name \*.[hc] -print0 | xargs -0 sed -i '
 		s:#include <linux/config\.h>:#include <linux/autoconf.h>:;