Version bump.

Add usb support for amd64, thanks to Roberto Castagnola <roberto.castagnola@gmail.com> (#211171).
Drop obsoleted modules.d file (#214021).
(Portage version: 2.1.4.4)

4 files changed, 88 insertions, 20 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index c1d40f67d334..572c3ad97d65 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,15 @@
 # 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.93 2008/02/20 07:04:45 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.94 2008/04/13 09:57:27 mrness Exp $
+
+*slmodem-2.9.11_pre20080401 (13 Apr 2008)
+
+  13 Apr 2008; Alin Năstac <mrness@gentoo.org>
+  +files/slmodem-2.9.11-amd64.patch, +files/slmodem-modprobe,
+  -slmodem-2.9.11_pre20070813.ebuild, +slmodem-2.9.11_pre20080401.ebuild:
+  Version bump. Add usb support for amd64, thanks to Roberto Castagnola
+  <roberto.castagnola@gmail.com> (#211171). Drop obsoleted modules.d file
+  (#214021).
 
   20 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
   slmodem-2.9.11_pre20080126.ebuild:
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch b/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch
new file mode 100644
index 000000000000..b6a4cfa02165
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch
@@ -0,0 +1,53 @@
+diff -aur slmodem-2.9.11-20080126.orig/drivers/Makefile slmodem-2.9.11-20080126/drivers/Makefile
+--- slmodem-2.9.11-20080126.orig/drivers/Makefile	2005-04-05 17:17:50.000000000 +0200
++++ slmodem-2.9.11-20080126/drivers/Makefile	2008-02-23 13:35:50.861045252 +0100
+@@ -20,7 +20,7 @@
+ 
+ EXTRA_CFLAGS = -I$(obj) -I$(obj)/../modem
+ 
+-obj-m := slamr.o slusb.o
++obj-m := slusb.o
+ 
+ slamr-objs:= amrmo_init.o sysdep_amr.o amrlibs.o
+ slusb-objs:= st7554.o
+@@ -71,7 +71,6 @@
+ 	$(LD) -r -o $@ $^
+ 
+ install: uninstall-old
+-	install -D -m 644 slamr.o $(module-dir)/slamr.o
+ 	install -D -m 644 slusb.o $(module-dir)/slusb.o
+ 	cp /etc/modules.conf /etc/modules.conf.slamr && \
+ 	    echo 'alias char-major-242 slamr' >> /etc/modules.conf && \
+@@ -101,7 +100,6 @@
+ all:
+ 	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)
+ install:
+-	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
+ 	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
+ 	/sbin/depmod -a
+ uninstall:
+diff -aur slmodem-2.9.11-20080126.orig/drivers/st7554.c slmodem-2.9.11-20080126/drivers/st7554.c
+--- slmodem-2.9.11-20080126.orig/drivers/st7554.c	2007-02-04 15:22:22.000000000 +0100
++++ slmodem-2.9.11-20080126/drivers/st7554.c	2008-02-23 13:08:55.768355723 +0100
+@@ -968,6 +968,11 @@
+ 	return -ENOIOCTLCMD;
+ }
+ 
++static long st7554_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
++{
++	return st7554_ioctl(NULL, file, cmd, arg);
++}
++
+ static int st7554_open(struct inode *inode, struct file *file)
+ {
+ 	struct st7554_state *s;
+@@ -1011,7 +1016,8 @@
+         .read =    st7554_read,
+         .write =   st7554_write,
+         .poll =    st7554_poll,
+-        .ioctl =   st7554_ioctl,
++        .unlocked_ioctl = st7554_ioctl32,
++        .compat_ioctl = st7554_ioctl32,
+         .open =    st7554_open,
+         .release = st7554_close,
+ };
diff --git a/net-dialup/slmodem/files/slmodem-modprobe b/net-dialup/slmodem/files/slmodem-modprobe
new file mode 100644
index 000000000000..9007e3de3223
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-modprobe
@@ -0,0 +1,4 @@
+# slmodem 2.9.x kernel modules configuration file
+
+alias char-major-242 slamr
+alias char-major-243 slusb
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20070813.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20080401.ebuild
index 998e0e032b9e..b833e0194cba 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20070813.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20080401.ebuild
@@ -1,10 +1,10 @@
 # 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_pre20070813.ebuild,v 1.3 2008/01/08 10:22:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080401.ebuild,v 1.1 2008/04/13 09:57:27 mrness Exp $
 
 inherit eutils linux-mod multilib
 
-UNGRAB_PV="20070505"
+UNGRAB_PV="2.9.11-20080126"
 
 DESCRIPTION="Driver for Smart Link modem"
 HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
@@ -13,7 +13,7 @@ SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P/_pre/-}.tar.gz
 
 LICENSE="Smart-Link"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa usb"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
@@ -32,12 +32,15 @@ pkg_setup() {
 	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
-			MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-			CONFIG_CHECK="USB"
-		fi
+	fi
+	if use usb; then
+		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
+		CONFIG_CHECK="USB"
 	fi
 	BUILD_TARGETS="all"
+	if kernel_is ge 2 6 24; then
+		CONFIG_CHECK="PCI_LEGACY"
+	fi
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}"
 }
@@ -49,10 +52,13 @@ src_unpack() {
 		ungrab-winmodem-${UNGRAB_PV}/Makefile
 	convert_to_m ungrab-winmodem-${UNGRAB_PV}/Makefile
 
+	cd "${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}"
 	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
 
 	cd "${S}"
 	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
+	epatch "${FILESDIR}/${P%%_*}-alsa-period-size.patch"
+	use amd64 && epatch "${FILESDIR}/${P%%_*}-amd64.patch"
 
 	cd "${S}"/drivers
 	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
@@ -64,7 +70,7 @@ src_unpack() {
 
 src_compile() {
 	local MAKE_PARAMS=""
-	if use alsa || use amd64; then
+	if use alsa; then
 		MAKE_PARAMS="SUPPORT_ALSA=1"
 	fi
 	emake ${MAKE_PARAMS} modem || die "failed to build modem"
@@ -90,26 +96,23 @@ src_install() {
 	if use alsa; then
 		sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \
 			-e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" "${D}/etc/conf.d/slmodem"
+	elif use usb; then
+		sed -i "s/# MODULE=slusb/MODULE=slusb/" "${D}/etc/conf.d/slmodem"
 	else
 		sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem"
 	fi
 
-	# Add module aliases and install udev script
-	insinto /etc/modules.d/
-	newins "${FILESDIR}/slmodem-modules" ${PN}
-	if use usb; then
-		exeinto /$(get_libdir)/udev
-		newexe "${FILESDIR}/slusb-udev.script" slmodem_usb.sh
-	fi
-
-	dodir /etc/modprobe.d
-	echo -e "blacklist slusb\nblacklist slamr\nblacklist snd-intel8x0m" >> "${D}/etc/modprobe.d/${PN}"
+	# Add module aliases
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}/slmodem-modprobe" ${PN}
 
 	# Add configuration for udev
 	dodir /etc/udev/rules.d/
 	echo 'KERNEL=="slamr", NAME="slamr0" GROUP="dialout"' > \
 		 "${D}/etc/udev/rules.d/55-${PN}.rules"
 	if use usb; then
+		exeinto /$(get_libdir)/udev
+		newexe "${FILESDIR}/slusb-udev.script" slmodem_usb.sh
 		echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout" RUN+="slmodem_usb.sh"' >> \
 			 "${D}/etc/udev/rules.d/55-${PN}.rules"
 	fi
@@ -151,5 +154,4 @@ pkg_postinst() {
 	elog "If you see the following in dmesg:"
 	elog "    slamr: device 10b9:5457 is grabbed by driver serial"
 	elog "you need to modprobe ungrab-winmodem before slamr"
-	elog "See /etc/modules.d/slmodem for details."
 }