Version bump. Fix broken build on hosts with kernel 2.6.24 (#207555).

(Portage version: 2.1.3.19)

5 files changed, 41 insertions, 17 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index c4851ec32f9a..15eadef370be 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.88 2008/01/08 10:22:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.89 2008/01/29 10:28:45 mrness Exp $
+
+*slmodem-2.9.11_pre20080126 (29 Jan 2008)
+
+  29 Jan 2008; Alin Năstac <mrness@gentoo.org>
+  +files/slmodem-2.9.11-kernel-2.6.24.patch,
+  -slmodem-2.9.11_pre20070505.ebuild, +slmodem-2.9.11_pre20080126.ebuild:
+  Version bump. Fix broken build on hosts with kernel 2.6.24 (#207555).
 
   08 Jan 2008; Markus Meier <maekke@gentoo.org>
   slmodem-2.9.11_pre20070813.ebuild:
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505
deleted file mode 100644
index 18cce0d9d83c..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 150c089024501e93e640c898aba2debf slmodem-2.9.11-20070505.tar.gz 840019
-RMD160 9b052bd749a96771060a63f2f27289287bf06f38 slmodem-2.9.11-20070505.tar.gz 840019
-SHA256 616a5d8cefb2fadec085c19a17a8e38a8c51d836fe4c813e874636f915249adc slmodem-2.9.11-20070505.tar.gz 840019
-MD5 748bfc7387006293f9eddde119fa9d6f ungrab-winmodem-20070505.tar.gz 2254
-RMD160 51b71b203688004718826f23dc2485223d8b4a17 ungrab-winmodem-20070505.tar.gz 2254
-SHA256 9fd9287638f89c17733bb4a6c981b00446f0be18589a71f10f69fca5006a7781 ungrab-winmodem-20070505.tar.gz 2254
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20080126 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20080126
new file mode 100644
index 000000000000..1fe981b8506f
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20080126
@@ -0,0 +1,6 @@
+MD5 d238e705af9e87b2251ee1768edc94f3 slmodem-2.9.11-20080126.tar.gz 841978
+RMD160 0a49fed9fdd932deef1a55308fb72b8949c75b1d slmodem-2.9.11-20080126.tar.gz 841978
+SHA256 ab17ec6d1be5ef8bc7e58f4847d45b434bb5fe44c7031358451133b4b7b34d86 slmodem-2.9.11-20080126.tar.gz 841978
+MD5 748bfc7387006293f9eddde119fa9d6f ungrab-winmodem-20070505.tar.gz 2254
+RMD160 51b71b203688004718826f23dc2485223d8b4a17 ungrab-winmodem-20070505.tar.gz 2254
+SHA256 9fd9287638f89c17733bb4a6c981b00446f0be18589a71f10f69fca5006a7781 ungrab-winmodem-20070505.tar.gz 2254
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch
new file mode 100644
index 000000000000..0238a301f3f8
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch
@@ -0,0 +1,14 @@
+--- drivers/amrmo_init.c	2008-01-29 12:19:19.000000000 +0200
++++ drivers/amrmo_init.c	2008-01-29 12:24:05.000000000 +0200
+@@ -609,7 +609,11 @@
+ 		}
+ 	}
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
+         ret = request_irq(amrmo->irq, &amrmo_pci_interrupt,SA_SHIRQ,
++#else
++        ret = request_irq(amrmo->irq, &amrmo_pci_interrupt,IRQF_SHARED,
++#endif
+ 			  amrmo->name,amrmo);
+ 	if(ret) {
+ 		printk(KERN_ERR "slamr: failed request_irq\n");
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20070505.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20080126.ebuild
index 3169fb4592a9..b56a51efa0b9 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20070505.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20080126.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20070505.ebuild,v 1.5 2007/10/28 13:51:04 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080126.ebuild,v 1.1 2008/01/29 10:28:45 mrness Exp $
 
 inherit eutils linux-mod multilib
 
+UNGRAB_PV="20070505"
+
 DESCRIPTION="Driver for Smart Link modem"
 HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
 SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz
-	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-${PV/*_pre/}.tar.gz"
+	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-${UNGRAB_PV}.tar.gz"
 
 LICENSE="Smart-Link"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa usb"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
@@ -27,7 +29,7 @@ S="${WORKDIR}"/${P/_pre/-}
 pkg_setup() {
 	use amd64 && multilib_toolchain_setup x86
 
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${PV/*_pre/})"
+	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})"
 	if ! use amd64; then
 		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
 		if use usb; then
@@ -43,14 +45,15 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}"
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${PV/*_pre/}:" \
-		ungrab-winmodem-${PV/*_pre/}/Makefile
-	convert_to_m ungrab-winmodem-${PV/*_pre/}/Makefile
+	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}:" \
+		ungrab-winmodem-${UNGRAB_PV}/Makefile
+	convert_to_m ungrab-winmodem-${UNGRAB_PV}/Makefile
 
 	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
 
 	cd "${S}"
 	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
+	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.24.patch"
 
 	cd "${S}"/drivers
 	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
@@ -92,7 +95,7 @@ src_install() {
 		sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem"
 	fi
 
-	# Add module aliases and install hotplug script
+	# Add module aliases and install udev script
 	insinto /etc/modules.d/
 	newins "${FILESDIR}/slmodem-modules" ${PN}
 	if use usb; then
@@ -113,7 +116,7 @@ src_install() {
 	fi
 
 	dodoc Changes README
-	newdoc "${WORKDIR}"/ungrab-winmodem-${PV/*_pre}/Readme.txt README-ungrab-winmodem.txt
+	newdoc "${WORKDIR}"/ungrab-winmodem-${UNGRAB_PV}/Readme.txt README-ungrab-winmodem.txt
 }
 
 pkg_postinst() {