Added patch to compile against kernel 2.6.22, thanks to Helmut Auer <helmut@helmutauer.de>.

Package-Manager: portage-2.1.3_rc7

4 files changed, 62 insertions, 11 deletions

diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog
index a36735c1d40e..e690b886665a 100644
--- a/media-video/em8300-modules/ChangeLog
+++ b/media-video/em8300-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/em8300-modules
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.41 2007/07/01 19:26:25 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.42 2007/07/10 13:40:17 zzam Exp $
+
+  10 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/em8300-modules-0.16.2-pci-module-init.patch,
+  em8300-modules-0.16.2.ebuild:
+  Added patch to compile against kernel 2.6.22, thanks to Helmut Auer
+  <helmut@helmutauer.de>.
 
 *em8300-modules-0.16.2 (06 May 2007)
 
diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest
index d4f029aa30e5..ea232efc94bf 100644
--- a/media-video/em8300-modules/Manifest
+++ b/media-video/em8300-modules/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX em8300-modules-0.16.0-i2c.patch 616 RMD160 9c6ffd8b6cd648207a6dd61455698ddf51067b48 SHA1 991e98ad930c9a01b9b8e0bbbbce223557093e2f SHA256 ad58fd49ba857cdcdc875f9bb52b999843d1b024029a6e4cf8757cdac86c6df9
 MD5 a0971051ef68d3b422a66d4017435568 files/em8300-modules-0.16.0-i2c.patch 616
 RMD160 9c6ffd8b6cd648207a6dd61455698ddf51067b48 files/em8300-modules-0.16.0-i2c.patch 616
 SHA256 ad58fd49ba857cdcdc875f9bb52b999843d1b024029a6e4cf8757cdac86c6df9 files/em8300-modules-0.16.0-i2c.patch 616
+AUX em8300-modules-0.16.2-pci-module-init.patch 1063 RMD160 37503a6bc5cb0ca9d9f3af33f65bcffb79af578c SHA1 95ac5a0b1ff608d1937f1ef60e6cc2e96f5ae515 SHA256 8f19661300d64f21313378910a48106988d9b4aaace1ba81df348fb181ea2285
+MD5 da74b5c1ceae20e96801cf7ee911440d files/em8300-modules-0.16.2-pci-module-init.patch 1063
+RMD160 37503a6bc5cb0ca9d9f3af33f65bcffb79af578c files/em8300-modules-0.16.2-pci-module-init.patch 1063
+SHA256 8f19661300d64f21313378910a48106988d9b4aaace1ba81df348fb181ea2285 files/em8300-modules-0.16.2-pci-module-init.patch 1063
 AUX modules.em8300 28 RMD160 e97b956f9a1579cbba5923f8949f937621334dc1 SHA1 76661fadd926194f7658391536901fdefdeaf409 SHA256 9ff4d147004d6df8b063b27da32f27eda4f83450046337a9cbf99206828ab038
 MD5 40448834cd5bc1bdc07ab84d8a3727cc files/modules.em8300 28
 RMD160 e97b956f9a1579cbba5923f8949f937621334dc1 files/modules.em8300 28
@@ -12,14 +19,14 @@ EBUILD em8300-modules-0.16.0-r1.ebuild 1137 RMD160 bd686aae3fda043b4256b8c904517
 MD5 797ab2bc199f1511709e1bf1f607e55c em8300-modules-0.16.0-r1.ebuild 1137
 RMD160 bd686aae3fda043b4256b8c90451792037691120 em8300-modules-0.16.0-r1.ebuild 1137
 SHA256 0dc1f358fa8585f43dfd3105f15ae20097733526464952490c3fcf089bccadad em8300-modules-0.16.0-r1.ebuild 1137
-EBUILD em8300-modules-0.16.2.ebuild 1101 RMD160 8cf229ac82e79e6afa6bff50581c5fc1603768f0 SHA1 7f697de90dc06cc29e0cee95a63dfb9a91537654 SHA256 0eef0ed04046c6062af228c6d2313b9f31ee2695c42ef4c61c51c8af90c78105
-MD5 5139b40a8b1d5322d74eb236915d89be em8300-modules-0.16.2.ebuild 1101
-RMD160 8cf229ac82e79e6afa6bff50581c5fc1603768f0 em8300-modules-0.16.2.ebuild 1101
-SHA256 0eef0ed04046c6062af228c6d2313b9f31ee2695c42ef4c61c51c8af90c78105 em8300-modules-0.16.2.ebuild 1101
-MISC ChangeLog 7388 RMD160 6b29e53718ada028e40b144946ebd3ba60498142 SHA1 7a033a33d7556eeb06602d8d15ae166eabd42858 SHA256 3e53abf779491cb75a6628e3ea01e417b35a14cfd773dd752fe429f5e1627977
-MD5 54c7d4dcf269061868b2c2539d6984a3 ChangeLog 7388
-RMD160 6b29e53718ada028e40b144946ebd3ba60498142 ChangeLog 7388
-SHA256 3e53abf779491cb75a6628e3ea01e417b35a14cfd773dd752fe429f5e1627977 ChangeLog 7388
+EBUILD em8300-modules-0.16.2.ebuild 1151 RMD160 6b66bec87411049c9310d29f11def8597f836caf SHA1 88ff83ac8cd07d5cdbedce11aa730ac16cd8bcb5 SHA256 0e03a7983653e42e4934bfa2992b5e838b0ea18d904525b2912c1c0b82f3a573
+MD5 37459afc088337705dacbf1cd8e77a9b em8300-modules-0.16.2.ebuild 1151
+RMD160 6b66bec87411049c9310d29f11def8597f836caf em8300-modules-0.16.2.ebuild 1151
+SHA256 0e03a7983653e42e4934bfa2992b5e838b0ea18d904525b2912c1c0b82f3a573 em8300-modules-0.16.2.ebuild 1151
+MISC ChangeLog 7622 RMD160 261fd931cd50268bb668c992cedb8672d0f9b413 SHA1 d737e161a410efb8ef2b9cfc4dfb6a251512ebfb SHA256 71feb7e40ae9c25c1a5bdfbfce99b26778b41f4c2c2326ab9702cf2b65f7b038
+MD5 4f6b1712102aeb300e0cd9043a53a615 ChangeLog 7622
+RMD160 261fd931cd50268bb668c992cedb8672d0f9b413 ChangeLog 7622
+SHA256 71feb7e40ae9c25c1a5bdfbfce99b26778b41f4c2c2326ab9702cf2b65f7b038 ChangeLog 7622
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -30,3 +37,10 @@ SHA256 53f1437c57da800d33ab234a3e7fbc2656120d857b3ced04ae4eb9cef30a6690 files/di
 MD5 330ad7702aaaa29d883c962536ed6fa8 files/digest-em8300-modules-0.16.2 241
 RMD160 b3f16f4db196198d561ea3c34f21636fe579bf89 files/digest-em8300-modules-0.16.2 241
 SHA256 ed68d56b93bb6c22cb37154644c47467c9d3594dc8f6ea821d5ecc88f982e41d files/digest-em8300-modules-0.16.2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGk4xLt2vP6XvVdOcRAoFgAJ9zw1z1pMaslETOGrXQW4b66xzvjQCg2T6E
+jmrlM+9yPtVvEST2jJlNsQk=
+=V2dR
+-----END PGP SIGNATURE-----
diff --git a/media-video/em8300-modules/em8300-modules-0.16.2.ebuild b/media-video/em8300-modules/em8300-modules-0.16.2.ebuild
index 2a933cb52442..1434243b8042 100644
--- a/media-video/em8300-modules/em8300-modules-0.16.2.ebuild
+++ b/media-video/em8300-modules/em8300-modules-0.16.2.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/media-video/em8300-modules/em8300-modules-0.16.2.ebuild,v 1.1 2007/07/01 19:26:25 zypher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.16.2.ebuild,v 1.2 2007/07/10 13:40:17 zzam Exp $
 
 inherit eutils linux-mod
 
@@ -24,7 +24,8 @@ S="${WORKDIR}/${MY_P}/modules"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}/.."
+	epatch "${FILESDIR}/${P}-pci-module-init.patch"
 }
 
 src_compile() {
diff --git a/media-video/em8300-modules/files/em8300-modules-0.16.2-pci-module-init.patch b/media-video/em8300-modules/files/em8300-modules-0.16.2-pci-module-init.patch
new file mode 100644
index 000000000000..02ba84ef885d
--- /dev/null
+++ b/media-video/em8300-modules/files/em8300-modules-0.16.2-pci-module-init.patch
@@ -0,0 +1,30 @@
+--- ChangeLog.old	2007-07-10 11:25:41.639463587 +0200
++++ ChangeLog	2007-07-10 12:19:05.650671612 +0200
+@@ -1,4 +1,12 @@
+ 2007-05-06  Nicolas Boullis  <nboullis@debian.org>
++2007-05-14  Nicolas Boullis  <nboullis@debian.org>
++	* modules/em8300_main.c:
++	Use pci_register_driver instead pci_module_init since the latter
++	is removed in linux 2.6.22. Thanks to Adam who noticed the problem
++	with linux 2.6.21-git5. The only expected change in behavior is
++	that the module won't fail to load with linux 2.4 kernels if no
++	em8300-based board is present.
++
+ 	* configure.in,
+ 	  modules/Makefile:
+ 	Release 0.16.2.
+--- modules/em8300_main.c.old	2007-07-10 11:25:53.637633244 +0200
++++ modules/em8300_main.c	2007-07-10 12:19:05.650671612 +0200
+@@ -800,10 +800,8 @@
+ 		}
+ 	}
+ 
+-	if ((err = pci_module_init(&em8300_driver)) < 0) {
+-#ifdef MODULE
+-		printk(KERN_ERR "Sigmadesigns EM8300 not found or device busy\n");
+-#endif
++	if ((err = pci_register_driver(&em8300_driver)) < 0) {
++		printk(KERN_ERR "em8300: unable to register PCI driver\n");
+ 		goto err_init;
+ 	}
+