Version bump. Fix open missing mode compilation error (#260114).

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

8 files changed, 51 insertions, 284 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 8345f93e4a92..1a658244281b 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,17 @@
 # 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.98 2008/07/06 19:11:56 opfer Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.99 2009/03/03 20:08:41 mrness Exp $
+
+*slmodem-2.9.11_pre20080817 (03 Mar 2009)
+
+  03 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  -files/slmodem-2.9.11-amd64.patch,
+  +files/slmodem-2.9.11-create-mode.patch,
+  -files/slmodem-2.9.11-kernel-2.6.24.patch,
+  -files/slmodem-2.9.11-makefile.patch,
+  -slmodem-2.9.11_pre20080126-r1.ebuild, -slmodem-2.9.11_pre20080401.ebuild,
+  +slmodem-2.9.11_pre20080817.ebuild:
+  Version bump. Fix open missing mode compilation error (#260114).
 
   06 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
   slmodem-2.9.11_pre20080417.ebuild:
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 0aa622b99ac4..fef43a7b2388 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -2,29 +2,25 @@
 Hash: SHA1
 
 AUX slmodem-2.9.11-alsa-period-size.patch 543 RMD160 233871b317df9c89751369f62cdd4198e9f47c84 SHA1 9c82d034873d1e472d48a240c955c457f84aa8d4 SHA256 48d3e09cc3e093dcea8985bfe297c3880e334b76a92d983e4333f03b4426d786
-AUX slmodem-2.9.11-amd64.patch 1810 RMD160 3cda96296ac1fed27b10ee47d5095c398da43d2d SHA1 4aa26ced9234cb86a4ba60288eb309a287f72e8d SHA256 696377ad97f89d7e95fb0463b335253d42f673a7e6eab2e12554352f867ea640
-AUX slmodem-2.9.11-kernel-2.6.24.patch 450 RMD160 c7cae33121da5e006f097171c8dd86a85db1327d SHA1 418137eb0ab52aa24b1be22c6010ed4410a2cf95 SHA256 5955c7df1747e0c207e557681149bfff650df7713757b89e7d5fd117ebc8ca20
+AUX slmodem-2.9.11-create-mode.patch 457 RMD160 6c05cd4e87346296a1393c11d44e3742345addec SHA1 adad0ae686deeaed769d2adc374535d16df89be4 SHA256 bc9c5d2cf92841cd6a3edb96953441e2260207a5295724dbfe4cd9f53df79e69
 AUX slmodem-2.9.11-makefile-r1.patch 1323 RMD160 63470a48371f80a95c2e23f7f80986b8b5352e80 SHA1 c1f671e865078b52d35af2f9cb6d2811ece615ef SHA256 4e2a7b86dc3922189f400eeb4c4c7d212931700d96bd99e6ab83aadfb103bb8b
-AUX slmodem-2.9.11-makefile.patch 872 RMD160 2e0c60d8bdf9d9c936c20d7941030fe3fc439402 SHA1 3c8d191a0e7983247a64e54ca70551fe4b83d046 SHA256 56518c7fa8ce442613ff9f23d87cbabe83ddb1fc21d10ae11dc8e7fd57610189
 AUX slmodem-confd 800 RMD160 7c5460263589cb8b384353484d08b100bdc5b8d2 SHA1 5a734d9121aed93aa40b9620a452b9ec08e30461 SHA256 f430a8bb00aa4ee3cda98ad9fee99125e16727064d0568709740b710ed3525c8
 AUX slmodem-initd 2150 RMD160 555400137ea686b7aabe8094f7df1d95fb47ad75 SHA1 aeefb115e753e49b6b3196ebbdb00e581ae82551 SHA256 f3bd184b5e6d500040bb6e437538ea38bf8207fd2d2808d0af2af0c5a2c270bd
 AUX slmodem-modprobe 105 RMD160 c40095b37f1ed4845dd41b72f969a25ceda27c50 SHA1 cdef71f168f3afd75860bafd58f46cb50f9d59af SHA256 6af712d27b2b218723788914ab30f52be231c811f547f5018a9919b2d0cddca0
 AUX slmodem-modules 640 RMD160 a25293786993d2d31e9c28654707d888754fda96 SHA1 b0392e449e7ef7a2bb305a5ee485c33a55b78011 SHA256 4294828807f82e0451e9f7fdf178f29eb58406d275a0fb5ec9977eb2cc5f72f8
 AUX slmodem-ungrab-winmodem-hp500.patch 1096 RMD160 8f1f16841e02b1473748452a3fd28544e2a41ac7 SHA1 3cb29893ba6507de2c5933fe1f3191ffdacf3bdb SHA256 6e95b2c8c47002016f491d02edd348d8883a2ffc522d90f37b14739158d24cf7
 AUX slusb-udev.script 257 RMD160 62a2d7d4ec28622e89b0dfb045b570a2687e1c9a SHA1 8f3e63fc953d036fcc47755ec399a6510cf22ce3 SHA256 e93d7a46309898cb6e578f5e56e8b25753b4c371260466b10875034cca96480a
-DIST slmodem-2.9.11-20080126.tar.gz 841978 RMD160 0a49fed9fdd932deef1a55308fb72b8949c75b1d SHA1 bae9d65fbb0fb5f4334af58e110d13324cda9410 SHA256 ab17ec6d1be5ef8bc7e58f4847d45b434bb5fe44c7031358451133b4b7b34d86
-DIST slmodem-2.9.11-20080401.tar.gz 843861 RMD160 004c64741b322a5d4e2fbd3ed42cdc2e7ce95c1d SHA1 fdffcfedd0ec27d21d816770147bb455917eebce SHA256 89eadd6348efe85ab3f50480be2af55c1e0cd1653f4f4c03f7cc51a1f23b8d22
 DIST slmodem-2.9.11-20080417.tar.gz 994453 RMD160 66f154382ce2a4a8e90193b96c9e7f9f6698835d SHA1 775b63b6140cd591338eecc9792d5e527f43f679 SHA256 8e2bdb5ef93961743368b3248cfc56ddc7c37140b67b8c0cc9d627a4489ed45e
+DIST slmodem-2.9.11-20080817.tar.gz 993873 RMD160 c13ed62dfaab437efda652ed63cff20a152b6765 SHA1 7838f19a32077ed5e0ecbfe06232a3840888c5eb SHA256 2d5e5005f19cd6bc9a24e22ca533babb8c26e94db8bbc81d81ac4732c853a252
 DIST ungrab-winmodem-2.9.11-20080126.tar.gz 2334 RMD160 1f738efc75e6907b63fb664dd6cfcfc4e9a96b7f SHA1 2678bb8995dd1b355a5fc20f2217919b8517ef66 SHA256 3d50bd46884216ea32306a7dcdddaad7910242bd7dfdef44a92fa12b5f5d3609
-EBUILD slmodem-2.9.11_pre20080126-r1.ebuild 4791 RMD160 10f903a0ec6c7a50007e86311141f31f47e35784 SHA1 a0fe09d00343ba7f215e73357f41538078ac97d4 SHA256 e8d8e748d8a3854144e578af0288ce6949342f3c99fcf4d1ee9a3b91e9e25a42
-EBUILD slmodem-2.9.11_pre20080401.ebuild 4649 RMD160 82ca643aeeaa29465120298408ec22951ffbb0bb SHA1 5d5557d2102362266ea60c6ee0dd662b8e17fb0a SHA256 515bfacd5bf47494189063c8d6bb10d3a19b25af26b345f417b4e2a4fd39f2a2
 EBUILD slmodem-2.9.11_pre20080417.ebuild 4957 RMD160 8bdd86f70f2fe61ce26b35d0357dbb88f71f7002 SHA1 1b73b3d3a2b343b53f78a5eca9bc19b393be5ad2 SHA256 4bd13e54b42cdf8ea0903913504cd7f1f4d87d5206ad87b35c4e009aeef17d25
-MISC ChangeLog 21456 RMD160 b7d16072f1e1786fc0f56952c0d19295f114419c SHA1 5c39058c6c236ed6ad1f8afb0430e7bbc9fb66b9 SHA256 cd68b3788f5c85f3551886030fccc57c4d7478d85a54f746c0bece856e735a24
+EBUILD slmodem-2.9.11_pre20080817.ebuild 4954 RMD160 23c2cd219b1a193a80468eb076d7d8c4b6160a41 SHA1 96272d7a2c844065ad07ad32572fd11dd1ba76e4 SHA256 b7459e500248dbb5ae14b336a7dcd91c8f3b9dd45f9fd16c55417dfd2b2c8396
+MISC ChangeLog 21896 RMD160 71dae287c0931c67434fdd8fd17871d05eb7cc2a SHA1 3f7b60adc81cc20d61255cb7a4fefb50f29871e4 SHA256 9803c2a2f2d5c5fed8b2829a0383661787c297ca3b7466e9e0457856b1000d21
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkhxGQIACgkQNQqtfCuFneOOMwCfeEamZyDvLlwQ2QbU+uLhhA2S
-ShgAn3t8harItXHxH9M/WW9LVJ0NvsjJ
-=nJQu
+iEYEARECAAYFAkmtqn4ACgkQts85UDFmaOV2vwCfQY7AHY+h6sOjTLJrcK9VX1zW
+5bQAnA4g+mL3oCSpx8yN209d/qEMnP1v
+=8ZaA
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch b/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch
deleted file mode 100644
index b6a4cfa02165..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-amd64.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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-2.9.11-create-mode.patch b/net-dialup/slmodem/files/slmodem-2.9.11-create-mode.patch
new file mode 100644
index 000000000000..c7f146f4d771
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-create-mode.patch
@@ -0,0 +1,12 @@
+diff -Nru slmodem-2.9.11-20080817.orig/modem/modem_datafile.c slmodem-2.9.11-20080817/modem/modem_datafile.c
+--- slmodem-2.9.11-20080817.orig/modem/modem_datafile.c	2008-03-29 12:04:16.000000000 +0000
++++ slmodem-2.9.11-20080817/modem/modem_datafile.c	2009-03-03 22:02:01.000000000 +0000
+@@ -111,7 +111,7 @@
+ 	int ret = -1;
+ 	int fd;
+ 
+-	fd = open(file_name,O_CREAT|O_WRONLY);
++	fd = open(file_name,O_CREAT|O_WRONLY, 0600);
+ 	if(fd < 0)
+ 		return -errno;
+ 
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
deleted file mode 100644
index 0238a301f3f8..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-kernel-2.6.24.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/files/slmodem-2.9.11-makefile.patch b/net-dialup/slmodem/files/slmodem-2.9.11-makefile.patch
deleted file mode 100644
index 7bc568ddaf8b..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.11-makefile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nru slmodem-2.9.11-20051101.orig/modem/Makefile slmodem-2.9.11-20051101/modem/Makefile
---- slmodem-2.9.11-20051101.orig/modem/Makefile	2005-11-01 17:33:34.000000000 +0200
-+++ slmodem-2.9.11-20051101/modem/Makefile	2006-09-09 18:04:39.680862000 +0300
-@@ -13,10 +13,10 @@
- #
- ###########################################################################
- 
--CC:= gcc
-+CC?= gcc
- RM:= rm -f
- 
--CFLAGS+= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM
-+CFLAGS+= -Wall -finline -I. -DCONFIG_DEBUG_MODEM
- 
- 
- modem-objs:= \
-@@ -33,13 +33,13 @@
- 
- #SUPPORT_ALSA:=1
- ifdef SUPPORT_ALSA
--slmodemd: -lasound
-+
- CFLAGS+= -DSUPPORT_ALSA=1
--LFLAGS+= -lasound
-+LDLIBS+= -lasound
- endif
- 
- slmodemd modem_test:
--	$(CC) $(LFLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
- 
- clean:
- 	$(RM) slmodemd modem_test modem_main.o modem_cmdline.o modem_test.o $(modem-objs) $(dp-objs) $(sysdep-objs)
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20080126-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20080126-r1.ebuild
deleted file mode 100644
index d14143cf7ec4..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20080126-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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_pre20080126-r1.ebuild,v 1.2 2008/04/13 13:30:48 maekke Exp $
-
-inherit eutils linux-mod multilib
-
-UNGRAB_PV="2.9.11-20080126"
-
-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-${UNGRAB_PV}.tar.gz"
-
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="-* ~amd64 x86"
-IUSE="alsa usb"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	amd64? ( app-emulation/emul-linux-x86-soundlibs )"
-
-RDEPEND="${DEPEND}
-	virtual/logger"
-
-QA_EXECSTACK="usr/sbin/slmodem_test usr/sbin/slmodemd"
-
-S="${WORKDIR}"/${P/_pre/-}
-
-pkg_setup() {
-	use amd64 && multilib_toolchain_setup x86
-
-	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
-	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}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	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
-
-	cd "${WORKDIR}/ungrab-winmodem-${UNGRAB_PV}"
-	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
-	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.24.patch"
-	epatch "${FILESDIR}/${P%%_*}-alsa-period-size.patch"
-
-	cd "${S}"/drivers
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
-	convert_to_m Makefile
-	sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c
-	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \
-		amrmo_init.c old_st7554.c
-}
-
-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"
-
-	use amd64 && multilib_toolchain_setup amd64
-	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
-
-	newconfd "${FILESDIR}/slmodem-confd" ${PN}
-	newinitd "${FILESDIR}/slmodem-initd" ${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 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 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
-		echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout" RUN+="slmodem_usb.sh"' >> \
-			 "${D}/etc/udev/rules.d/55-${PN}.rules"
-	fi
-
-	dodoc Changes README
-	newdoc "${WORKDIR}"/ungrab-winmodem-${UNGRAB_PV}/Readme.txt README-ungrab-winmodem.txt
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs or udev
-	if [ -e "${ROOT}/dev/.udev" ]; then
-		ebegin "Reloading udev rules..."
-			udevcontrol reload_rules
-		eend $?
-	else
-		cd "${S}/drivers"
-		make DESTDIR="${ROOT}" install-devices
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been blacklisted in /etc/modprobe.d/${PN}"
-	elog "You must edit /etc/conf.d/${PN} for your configuration"
-	elog "To add slmodem to your startup - type : rc-update add slmodem default"
-	elog
-
-	if use alsa; then
-		elog "I hope you have already added alsa to your startup: "
-		elog "otherwise type: rc-update add alsasound boot"
-		elog
-		elog "If you need to use snd-intel8x0m from the kernel"
-		elog "compile it as a module and edit /etc/modules.d/alsa"
-		elog 'to: "alias snd-card-(number) snd-intel8x0m"'
-		elog
-	fi
-
-	elog "You need to be in the uucp AND dialout group to make calls as a user."
-	elog
-	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."
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20080401.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20080817.ebuild
index b833e0194cba..5c800bed727f 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20080401.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20080817.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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_pre20080401.ebuild,v 1.1 2008/04/13 09:57:27 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20080817.ebuild,v 1.1 2009/03/03 20:08:41 mrness Exp $
 
 inherit eutils linux-mod multilib
 
@@ -30,16 +30,24 @@ pkg_setup() {
 	use amd64 && multilib_toolchain_setup x86
 
 	MODULE_NAMES="ungrab-winmodem(:${WORKDIR}/ungrab-winmodem-${UNGRAB_PV})"
+	CONFIG_CHECK=""
+	MY_SLMODULES=""
 	if ! use amd64; then
 		MODULE_NAMES="${MODULE_NAMES} slamr(net:${S}/drivers)"
+		MY_SLMODULES="${MY_SLMODULES} slamr.o"
 	fi
-	if use usb; then
+	if kernel_is ge 2 6 25; then
+	    if use usb; then
+		ewarn "slusb module will not be installed because is not compatible with kernels >=2.6.25"
+	    fi
+	elif use usb; then
 		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-		CONFIG_CHECK="USB"
+		CONFIG_CHECK="${CONFIG_CHECK} USB"
+		MY_SLMODULES="${MY_SLMODULES} slusb.o"
 	fi
 	BUILD_TARGETS="all"
 	if kernel_is ge 2 6 24; then
-		CONFIG_CHECK="PCI_LEGACY"
+		CONFIG_CHECK="${CONFIG_CHECK} PCI_LEGACY"
 	fi
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERNEL_DIR=${KV_OUT_DIR}"
@@ -56,12 +64,13 @@ src_unpack() {
 	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"
+	epatch "${FILESDIR}/${P%%_*}-makefile-r1.patch"
+	epatch "${FILESDIR}/${P%%_*}-create-mode.patch"
 
 	cd "${S}"/drivers
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
+	sed -i -e "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \
+	    -e "s|^obj-m:=.*$|obj-m:=${MY_SLMODULES}|" \
+	    Makefile
 	convert_to_m Makefile
 	sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c
 	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \