Fix 2.6.16 compiling, thanks to pb <gentoobugzilla@mytrashmail.com> in bug 127176, remove old ebuilds

(Portage version: 2.1_pre6-r4)

8 files changed, 11 insertions, 461 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 892c658f8366..12a30a9e99b7 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.56 2006/02/25 21:31:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.57 2006/03/22 20:46:52 genstef Exp $
+
+  22 Mar 2006; Stefan Schweizer <genstef@gentoo.org>
+  -slmodem-2.9.11_pre20050816.ebuild, -slmodem-2.9.11_pre20051009.ebuild,
+  -slmodem-2.9.11_pre20051009-r1.ebuild, slmodem-2.9.11_pre20051101.ebuild:
+  Fix 2.6.16 compiling, thanks to pb <gentoobugzilla@mytrashmail.com> in bug
+  127176, remove old ebuilds
 
   25 Feb 2006; Daniel Black <dragonheart@gentoo.org> metadata.xml:
   I've not maintained this for a while. removing self from metadata. Thanks
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20050816 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20050816
deleted file mode 100644
index ba6275faa8e4..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20050816
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9da522c02ae054251ef69618de928e98 slmodem-2.9.11-20050816.tar.gz 828674
-MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051009 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051009
deleted file mode 100644
index 96c7de961cbb..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051009
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 292fec9aab5b2225cc94acc3a3c2adf2 slmodem-2.9.11-20051009.tar.gz 833615
-MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051009-r1 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051009-r1
deleted file mode 100644
index 96c7de961cbb..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051009-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 292fec9aab5b2225cc94acc3a3c2adf2 slmodem-2.9.11-20051009.tar.gz 833615
-MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20050816.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20050816.ebuild
deleted file mode 100644
index 337b86b50381..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20050816.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2005 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_pre20050816.ebuild,v 1.5 2005/10/16 09:11:45 mrness Exp $
-
-inherit eutils linux-mod
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
-SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/snapshots/${P/_pre/-}.tar.gz
-	http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem.tar.gz"
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="~x86 -*"
-IUSE="alsa usb"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-S=${WORKDIR}/${P/_pre/-}
-
-pkg_setup() {
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem) slamr(net:${S}/drivers)"
-	if use usb; then
-		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-		CONFIG_CHECK="USB"
-	fi
-	BUILD_TARGETS="all"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-	MODULESD_UNGRAB_WINMODEM_ENABLED="no"
-	MODULESD_SLAMR_ENABLED="no"
-	MODULESD_SLUSB_ENABLED="no"
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		${WORKDIR}/ungrab-winmodem/Makefile
-	convert_to_m ${WORKDIR}/ungrab-winmodem/Makefile
-
-	cd ${S}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \
-		${S}/drivers/Makefile
-	convert_to_m ${S}/drivers/Makefile
-	epatch ${FILESDIR}/slmodem-class-simple-to-class.diff
-	epatch ${FILESDIR}/slmodem-remove-URB_ASYNC_UNLINK.patch
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if use alsa; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd ${S}
-	newsbin modem/modem_test slmodem_test
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /var/lib/slmodem
-	keepdir /var/lib/slmodem
-
-	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
-	exeinto /etc/init.d/; newexe ${FILESDIR}/${PN}-2.9.init ${PN}
-
-	# configure for alsa - or not for alsa
-	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
-	else
-		sed -i "s/# MODULE=slamr/MODULE=slamr/" ${D}/etc/conf.d/slmodem
-	fi
-
-
-	# Add module aliases and install hotplug script
-	insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.11.modules ${PN}
-	if use usb; then
-		exeinto /etc/hotplug/usb; newexe ${FILESDIR}/slusb.hotplug slusb
-	fi
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/${PN}
-
-	# Add configuration for devfs, udev
-	if [ -e ${ROOT}/dev/.devfsd ] ; then
-		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
-	elif [ -e ${ROOT}/dev/.udev ] ; then
-		dodir /etc/udev/rules.d/
-		echo 'KERNEL="slamr", NAME="slamr0" GROUP="dialout"' > \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-		echo 'KERNEL="slusb", NAME="slusb0" GROUP="dialout"' >> \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-	fi
-
-	dodoc Changes README ${WORKDIR}/ungrab-winmodem/Readme.txt
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs or udev
-	if [ -e ${ROOT}/dev/.devfsd ]; then
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-
-	elif [ -e ${ROOT}/dev/.udev ]; then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend $?
-	else
-		cd ${S}/drivers
-		make DESTDIR=${ROOT} install-devices
-	fi
-
-	if [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"
-	einfo "You must edit /etc/conf.d/${PN} for your configuration"
-	einfo "To add slmodem to your startup - type : rc-update add slmodem default"
-
-	if use alsa; then
-		einfo "I hope you have already added alsa to your startup: "
-		einfo "otherwise type: rc-update add alsasound boot"
-		einfo
-		einfo "If you need to use snd-intel8x0m from the kernel"
-		einfo "compile it as a module and edit /etc/modules.d/alsa"
-		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
-	fi
-
-	einfo "You need to be in the uucp AND dialout group to make calls as a user."
-	einfo
-	einfo "If you see the following in dmesg:"
-	echo slamr: device 10b9:5457 is grabbed by driver serial
-	einfo "you need to modprobe ungrab-winmodem before slamr"
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051009-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051009-r1.ebuild
deleted file mode 100644
index 0b58f9a91daa..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051009-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2005 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_pre20051009-r1.ebuild,v 1.1 2005/10/22 22:45:07 genstef Exp $
-
-inherit eutils linux-mod multilib
-
-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.tar.gz"
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa usb"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
-	amd64? ( app-emulation/emul-linux-x86-soundlibs )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-S=${WORKDIR}/${P/_pre/-}
-
-pkg_setup() {
-	has_multilib_profile && ABI=x86
-
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)"
-	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
-	BUILD_TARGETS="all"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-	MODULESD_UNGRAB_WINMODEM_ENABLED="no"
-	MODULESD_SLAMR_ENABLED="no"
-	MODULESD_SLUSB_ENABLED="no"
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		${WORKDIR}/ungrab-winmodem/Makefile
-	convert_to_m ${WORKDIR}/ungrab-winmodem/Makefile
-
-	cd ${S}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \
-		${S}/drivers/Makefile
-	convert_to_m ${S}/drivers/Makefile
-	epatch ${FILESDIR}/slmodem-remove-URB_ASYNC_UNLINK.patch
-	epatch ${FILESDIR}/slmodem-amd64-Makefile.diff
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if use alsa || use amd64; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	has_multilib_profile && ABI=${DEFAULT_ABI}
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd ${S}
-	newsbin modem/modem_test slmodem_test
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /var/lib/slmodem
-	keepdir /var/lib/slmodem
-
-	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
-	exeinto /etc/init.d/; newexe ${FILESDIR}/${PN}-2.9.11.init ${PN}
-
-	# configure for alsa - or not for alsa
-	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
-	else
-		sed -i "s/# MODULE=slamr/MODULE=slamr/" ${D}/etc/conf.d/slmodem
-	fi
-
-
-	# Add module aliases and install hotplug script
-	insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.11.modules ${PN}
-	if use usb; then
-		exeinto /etc/hotplug/usb; newexe ${FILESDIR}/slusb.hotplug slusb
-	fi
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/${PN}
-
-	# Add configuration for devfs, udev
-	if [ -e ${ROOT}/dev/.devfsd ] ; then
-		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
-	elif [ -e ${ROOT}/dev/.udev ] ; then
-		dodir /etc/udev/rules.d/
-		echo 'KERNEL="slamr", NAME="slamr0" GROUP="dialout"' > \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-		echo 'KERNEL="slusb", NAME="slusb0" GROUP="dialout"' >> \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-	fi
-
-	dodoc Changes README ${WORKDIR}/ungrab-winmodem/Readme.txt
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs or udev
-	if [ -e ${ROOT}/dev/.devfsd ]; then
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-
-	elif [ -e ${ROOT}/dev/.udev ]; then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend $?
-	else
-		cd ${S}/drivers
-		make DESTDIR=${ROOT} install-devices
-	fi
-
-	if [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"
-	einfo "You must edit /etc/conf.d/${PN} for your configuration"
-	einfo "To add slmodem to your startup - type : rc-update add slmodem default"
-
-	if use alsa; then
-		einfo "I hope you have already added alsa to your startup: "
-		einfo "otherwise type: rc-update add alsasound boot"
-		einfo
-		einfo "If you need to use snd-intel8x0m from the kernel"
-		einfo "compile it as a module and edit /etc/modules.d/alsa"
-		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
-	fi
-
-	einfo "You need to be in the uucp AND dialout group to make calls as a user."
-	einfo
-	einfo "If you see the following in dmesg:"
-	echo slamr: device 10b9:5457 is grabbed by driver serial
-	einfo "you need to modprobe ungrab-winmodem before slamr"
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051009.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051009.ebuild
deleted file mode 100644
index 29a61bf4e0c1..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051009.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2005 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_pre20051009.ebuild,v 1.2 2005/10/16 09:11:45 mrness Exp $
-
-inherit eutils linux-mod multilib
-
-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.tar.gz"
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa usb"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
-	amd64? ( app-emulation/emul-linux-x86-soundlibs )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-S=${WORKDIR}/${P/_pre/-}
-
-pkg_setup() {
-	has_multilib_profile && ABI=x86
-
-	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem)"
-	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
-	BUILD_TARGETS="all"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-	MODULESD_UNGRAB_WINMODEM_ENABLED="no"
-	MODULESD_SLAMR_ENABLED="no"
-	MODULESD_SLUSB_ENABLED="no"
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		${WORKDIR}/ungrab-winmodem/Makefile
-	convert_to_m ${WORKDIR}/ungrab-winmodem/Makefile
-
-	cd ${S}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \
-		${S}/drivers/Makefile
-	convert_to_m ${S}/drivers/Makefile
-	epatch ${FILESDIR}/slmodem-remove-URB_ASYNC_UNLINK.patch
-	epatch ${FILESDIR}/slmodem-amd64-Makefile.diff
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if use alsa || use amd64; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	has_multilib_profile && ABI=${DEFAULT_ABI}
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd ${S}
-	newsbin modem/modem_test slmodem_test
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /var/lib/slmodem
-	keepdir /var/lib/slmodem
-
-	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
-	exeinto /etc/init.d/; newexe ${FILESDIR}/${PN}-2.9.init ${PN}
-
-	# configure for alsa - or not for alsa
-	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
-	else
-		sed -i "s/# MODULE=slamr/MODULE=slamr/" ${D}/etc/conf.d/slmodem
-	fi
-
-
-	# Add module aliases and install hotplug script
-	insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.11.modules ${PN}
-	if use usb; then
-		exeinto /etc/hotplug/usb; newexe ${FILESDIR}/slusb.hotplug slusb
-	fi
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/${PN}
-
-	# Add configuration for devfs, udev
-	if [ -e ${ROOT}/dev/.devfsd ] ; then
-		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
-	elif [ -e ${ROOT}/dev/.udev ] ; then
-		dodir /etc/udev/rules.d/
-		echo 'KERNEL="slamr", NAME="slamr0" GROUP="dialout"' > \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-		echo 'KERNEL="slusb", NAME="slusb0" GROUP="dialout"' >> \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-	fi
-
-	dodoc Changes README ${WORKDIR}/ungrab-winmodem/Readme.txt
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs or udev
-	if [ -e ${ROOT}/dev/.devfsd ]; then
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-
-	elif [ -e ${ROOT}/dev/.udev ]; then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend $?
-	else
-		cd ${S}/drivers
-		make DESTDIR=${ROOT} install-devices
-	fi
-
-	if [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"
-	einfo "You must edit /etc/conf.d/${PN} for your configuration"
-	einfo "To add slmodem to your startup - type : rc-update add slmodem default"
-
-	if use alsa; then
-		einfo "I hope you have already added alsa to your startup: "
-		einfo "otherwise type: rc-update add alsasound boot"
-		einfo
-		einfo "If you need to use snd-intel8x0m from the kernel"
-		einfo "compile it as a module and edit /etc/modules.d/alsa"
-		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
-	fi
-
-	einfo "You need to be in the uucp AND dialout group to make calls as a user."
-	einfo
-	einfo "If you see the following in dmesg:"
-	echo slamr: device 10b9:5457 is grabbed by driver serial
-	einfo "you need to modprobe ungrab-winmodem before slamr"
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
index 3502aea050c6..bf6463116fa0 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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_pre20051101.ebuild,v 1.1 2005/11/06 13:58:42 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild,v 1.2 2006/03/22 20:46:52 genstef Exp $
 
 inherit eutils linux-mod multilib
 
@@ -50,6 +50,8 @@ src_unpack() {
 	sed -i "s: -O::" ${S}/modem/Makefile
 	sed -i "s:LFLAGS:LDFLAGS:" ${S}/modem/Makefile
 	sed -i "s/^slmodemd: -lasound$//" ${S}/modem/Makefile
+	cd drivers
+	sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c
 }
 
 src_compile() {