don't block installation for kernels >= 2.6.10 but don't install slamr module (#75656)

6 files changed, 44 insertions, 30 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 624ef12287dd..33cbedca883f 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.33 2004/12/29 21:54:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.34 2004/12/29 22:38:21 mrness Exp $
 
 *slmodem-2.9.10-r3 (29 Dec 2004)
 
-  29 Dec 2004; Alin Nastac <mrness@gentoo.org> slmodem-2.9.10-r1.ebuild,
-  slmodem-2.9.10-r2.ebuild, +slmodem-2.9.10-r3.ebuild:
-  Block installation for kernel versions >= 2.6.10 (#75656). Rewrite ebuild
+  29 Dec 2004; Alin Nastac <mrness@gentoo.org>
+  +files/slmodem-2.9.10-fix-for-2.6.10.patch, +slmodem-2.9.10-r3.ebuild:
+  Don't install slamr for kernel versions >= 2.6.10 (#75656). Rewrite ebuild
   using linux-mod eclass. Create /dev/ppp device at install time (#75913).
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index ccb3c33bbc87..d69e95a5e6e0 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1192823eb3008f3da7481de34a59b26f slmodem-2.9.10-r1.ebuild 4157
-MD5 53f3903f790bc8415cb34dc5eb45f683 slmodem-2.9.10-r3.ebuild 4054
-MD5 ec1a46d3838abb397f9ab587a0deaf21 slmodem-2.9.10-r2.ebuild 4037
-MD5 4f9a58e66ad785305254578789111d42 ChangeLog 8301
+MD5 075f91989789dd232a547218cbaacf28 slmodem-2.9.10-r1.ebuild 3964
+MD5 3558cd89bda3a445b21a3fb1b4f4e74b slmodem-2.9.10-r3.ebuild 4211
+MD5 536adbca9848d8a84bb81c32b49e227f slmodem-2.9.10-r2.ebuild 3895
+MD5 dcd0f77f2d71d5158bdc7701e3f98b58 ChangeLog 8294
 MD5 93dd8a9d0c0f815e8445d9f0c1fc0910 metadata.xml 578
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
 MD5 026f2e2fae1fbd999455b36630164a88 files/slmodem-2.9.10-usb_endpoint_halted-gentoo.patch 830
@@ -15,10 +15,11 @@ MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r1 66
 MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r2 66
 MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r3 66
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
+MD5 190cd2721bad42e351959ae4c90fa812 files/slmodem-2.9.10-fix-for-2.6.10.patch 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB0yeHjtv59x0+BrURApNqAKCdjz0xXqjQaeTGb8l1FvzrDxmMxACfSv/Q
-GIobdbMjK904GPPkWNkIeuY=
-=hPO3
+iD8DBQFB0zHmjtv59x0+BrURAjZ2AKCuTIqZRj11jZqnrv+MG/Dw2IlYMQCfaQXa
+SbvvAIPxQ3AqYWI/tB5HFcA=
+=iwQc
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/slmodem-2.9.10-fix-for-2.6.10.patch b/net-dialup/slmodem/files/slmodem-2.9.10-fix-for-2.6.10.patch
new file mode 100644
index 000000000000..d2035b6d2fef
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.10-fix-for-2.6.10.patch
@@ -0,0 +1,15 @@
+From Linux 2.6.10 onwards, pci_register_driver returns 0 on success and negative on failure
+
+- Daniel Drake <dsd@gentoo.org>
+
+--- slmodem-2.9.10/drivers/amrmo_init.c.orig	2004-12-25 23:53:51.345258848 +0000
++++ slmodem-2.9.10/drivers/amrmo_init.c	2004-12-25 23:54:33.528845968 +0000
+@@ -740,7 +740,7 @@
+ 	}
+ #endif
+ 
+-	if (!pci_register_driver(&amrmo_pci_driver)) {
++	if (pci_register_driver(&amrmo_pci_driver) < 0) {
+ 		pci_unregister_driver(&amrmo_pci_driver);
+ #ifndef OLD_KERNEL
+ 		class_simple_destroy(amrmo_class);
diff --git a/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
index be99129d5533..ff6a7d6068ac 100644
--- a/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild,v 1.4 2004/12/29 21:54:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild,v 1.5 2004/12/29 22:38:21 mrness Exp $
 
 inherit kernel-mod eutils
 
@@ -21,10 +21,6 @@ RDEPEND="virtual/libc
 	alsa? ( media-libs/alsa-lib )"
 
 pkg_setup() {
-	if [ "${KV_MAJOR}" -eq 2 -a "${KV_MINOR}" -eq 6 -a "${KV_PATCH}" -ge 10 ]; then
-		eerror "This package isn't compatible with kernel versions >= 2.6.10!"
-		die "unsupported kernel version"
-	fi
 	kernel-mod_check_modules_supported
 }
 
diff --git a/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild
index 3e2c7e92f132..4e61417728a2 100644
--- a/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild,v 1.4 2004/12/29 21:54:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r2.ebuild,v 1.5 2004/12/29 22:38:21 mrness Exp $
 
 inherit eutils linux-info
 
@@ -21,10 +21,6 @@ RDEPEND="virtual/libc
 	alsa? ( media-libs/alsa-lib )"
 
 pkg_setup() {
-	if kernel_is ge 2 6 10; then
-		eerror "This package isn't compatible with kernel versions >= 2.6.10!"
-		die "unsupported kernel version"
-	fi
 	check_modules_supported
 }
 
diff --git a/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild
index cbfba58d4add..5d5e0b57376b 100644
--- a/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild,v 1.1 2004/12/29 21:54:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r3.ebuild,v 1.2 2004/12/29 22:38:21 mrness Exp $
 
 inherit eutils linux-mod
 
@@ -21,10 +21,15 @@ RDEPEND="virtual/libc
 	alsa? ( media-libs/alsa-lib )"
 
 pkg_setup() {
+	MODULE_NAMES=""
 	if kernel_is ge 2 6 10; then
-		eerror "This package isn't compatible with kernel versions >= 2.6.10!"
-		die "unsupported kernel version"
+		ewarn "slamr isn't compatible with kernel versions >= 2.6.10!"
+		ewarn "It will not be installed"
+	else
+		MODULE_NAMES="slamr(extra:${S}/drivers)"
 	fi
+	useq usb && MODULE_NAMES="${MODULE_NAMES} slusb(extra:${S}/drivers)"
+	BUILD_TARGETS="all"
 
 	local CONFIG_CHECK=""
 	if useq alsa; then
@@ -34,22 +39,22 @@ pkg_setup() {
 		CONFIG_CHECK="${CONFIG_CHECK} USB"
 	fi
 
-	MODULE_NAMES="slamr(extra:${S}/drivers)"
-	useq usb && MODULE_NAMES="${MODULE_NAMES} slusb(extra:${S}/drivers)"
-	BUILD_TARGETS="all"
-
 	linux-mod_pkg_setup
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-usb_endpoint_halted-gentoo.patch || die "failed to apply patch for fixing usb_endpoint"
+	epatch ${FILESDIR}/${P}-usb_endpoint_halted-gentoo.patch || die "failed to apply fix for usb_endpoint"
 
 	# http://marc.theaimsgroup.com/?l=gentoo-dev&m=109672618708314&w=2
 	if kernel_is ge 2 6 6; then
 		sed -i 's:SUBDIRS=:M=:g' drivers/Makefile
 	fi
+
+	if kernel_is ge 2 6 10; then
+		epatch ${FILESDIR}/${P}-fix-for-2.6.10.patch || die "failed to apply fix for kernels >= 2.6.10"
+	fi
 }
 
 src_compile() {
@@ -100,7 +105,8 @@ src_install() {
 	#Create device nodes, add module aliases and install hotplug script
 	make -C drivers DESTDIR=${D} KERNEL_DIR="${ROOT}/usr/src/linux" install-devices
 	insinto /etc/modules.d/; insopts -m0644; newins ${FILESDIR}/${PN}-2.9.modules ${PN}
-	insinto /etc/hotplug/usb; insopts -m0755; newins ${FILESDIR}/slusb.hotplug slusb
+	useq usb &&
+		( insinto /etc/hotplug/usb; insopts -m0755; newins ${FILESDIR}/slusb.hotplug slusb )
 
 	dodir /etc/hotplug/blacklist.d
 	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/55-${PN}