Version bump.

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

5 files changed, 96 insertions, 27 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/Manifest b/net-dialup/slmodem/Manifest
index 04518f4aa6cd..934af3030928 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -2,26 +2,27 @@
 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-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-20070813.tar.gz 838510 RMD160 9fa5697d00a242e5ad33fa39bdcf48d7b3954955 SHA1 c686623fa6233040b0448a71973c8b09d422621c SHA256 7698ef23b4993446644eb609107aa7840d56dc5a86db4c96cbfa2caef4156125
 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 ungrab-winmodem-2.9.11-20080126.tar.gz 2334 RMD160 1f738efc75e6907b63fb664dd6cfcfc4e9a96b7f SHA1 2678bb8995dd1b355a5fc20f2217919b8517ef66 SHA256 3d50bd46884216ea32306a7dcdddaad7910242bd7dfdef44a92fa12b5f5d3609
-DIST ungrab-winmodem-20070505.tar.gz 2254 RMD160 51b71b203688004718826f23dc2485223d8b4a17 SHA1 a89f3bcb2519b4d8413eac45aa984be19f2f49b4 SHA256 9fd9287638f89c17733bb4a6c981b00446f0be18589a71f10f69fca5006a7781
-EBUILD slmodem-2.9.11_pre20070813.ebuild 4568 RMD160 4b660ce31bd924b613a348261eeb1168e7299140 SHA1 166d66ebea8d2fee4a2bf04c48541fd303806ab2 SHA256 9d8cda17597de92d8aa507ec71d1d14ddeccd569a56e13825ff01d95e8dc2631
 EBUILD slmodem-2.9.11_pre20080126-r1.ebuild 4792 RMD160 c80b811745a11432cf3a4ef1759e7c605ec0ff8d SHA1 621795b0b5b8f21d5bec65c6940c33e4001999aa SHA256 cbdce50df0cc0a5cdd9b3044c68451e2a64fab54c4e956e03d4edee1d469cf84
 EBUILD slmodem-2.9.11_pre20080126.ebuild 4733 RMD160 5074bb8622bae92700c636d8649072700145aa1b SHA1 bd2d4751b90ea9f3d2f0b94bc6268ba6d96d6194 SHA256 ef8c3071b2e5d659c5ca7cddb9112db6938777586176a535e7abbce111934ef0
-MISC ChangeLog 20416 RMD160 27973f6bbdc2b1b48f7c8061696cca36dab1ee0a SHA1 2a38a5d2bc113fee90ee96123a3def5f7a332d82 SHA256 bff506e9bea547d88d4482a0284e67d8c3715e7c512d8b6ec4495150e94dd4c5
+EBUILD slmodem-2.9.11_pre20080401.ebuild 4649 RMD160 82ca643aeeaa29465120298408ec22951ffbb0bb SHA1 5d5557d2102362266ea60c6ee0dd662b8e17fb0a SHA256 515bfacd5bf47494189063c8d6bb10d3a19b25af26b345f417b4e2a4fd39f2a2
+MISC ChangeLog 20804 RMD160 3da4f3acd7c63678901cddbebc3c651c73b0e71b SHA1 83e0d4d62a3463d5b1458fd82afff9644bbad38a SHA256 14c6d3b6ffc95d725ff0403c9dfc78a807400f795fc09b7fa2725ee8101a7a31
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHu9F+NQqtfCuFneMRApxuAJ4rl5opGEX1YN8sKQ19VgKvdhQTBACglnIS
-t37I2WaEdaiNJwgQUGeBxnA=
-=7mdd
+iD8DBQFIAdkr+fWpoTWIA9ERAhhDAJ0Wm6ZGHYoANV15XfSpImdknqKoHQCfbe9I
+yErOYAabDsbdQKi3qSxmZHg=
+=T9FV
 -----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
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."
 }