Readd ALSA modem fix thanks to Jos Delbar <jos.delbar@ugent.be> in bug 77184

(Portage version: 2.0.51-r14)

5 files changed, 172 insertions, 12 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index acd3d4102c1a..1453c79b1819 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.37 2005/01/18 21:42:31 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.38 2005/01/21 16:09:20 dsd Exp $
+
+*slmodem-2.9.9a-r1 (21 Jan 2005)
+
+  21 Jan 2005; Daniel Drake <dsd@gentoo.org> +files/slmodem-2.9.9a-alsa.patch,
+  +slmodem-2.9.9a-r1.ebuild:
+  Readd ALSA modem fix thanks to Jos Delbar <jos.delbar@ugent.be> in bug 77184
 
   19 Jan 2005; Daniel Drake <dsd@gentoo.org> -slmodem-2.9.10-r1.ebuild,
   slmodem-2.9.9a.ebuild:
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 9af7f3aef452..1457a6fc9b14 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 7ff32e74fc2b4dd76c51c423b5634c18 slmodem-2.9.9a-r1.ebuild 3838
 MD5 892305278c2052d7be27f77a9c103679 slmodem-2.9.9a.ebuild 3864
-MD5 e3f53d3ee8a8be4446fb8d07d4190038 ChangeLog 9380
+MD5 aaa479fc1c8a3bd06107bef5bc2f473a ChangeLog 9602
 MD5 93dd8a9d0c0f815e8445d9f0c1fc0910 metadata.xml 578
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
+MD5 0eddf6239c6536fc043144a9ea06fa2a files/slmodem-2.9.9a-alsa.patch 1040
 MD5 67543ad2e41e6dbc2150057340bb82b1 files/slmodem-2.9.conf 752
 MD5 64d03a3c87a5330faa6b8dd9d344b6a3 files/slmodem-2.9.init 2657
 MD5 ef9ad53b66480e01974b9f183e4edbc8 files/digest-slmodem-2.9.9a 66
+MD5 ef9ad53b66480e01974b9f183e4edbc8 files/digest-slmodem-2.9.9a-r1 66
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
 MD5 026f2e2fae1fbd999455b36630164a88 files/slmodem-usb_endpoint_halted-gentoo.patch 830
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB7agoiJcSIUGNthERAjYeAJ9MLEqUESyz3CYi0TyYK7D5eaY8OQCg2uOq
-/vFZOxfxzvZ0PYAJbYPYqYg=
-=7aZi
------END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9a-r1 b/net-dialup/slmodem/files/digest-slmodem-2.9.9a-r1
new file mode 100644
index 000000000000..e1578e200497
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.9a-r1
@@ -0,0 +1 @@
+MD5 2330415f6b60b4eb4593592abb09da7b slmodem-2.9.9a.tar.gz 709728
diff --git a/net-dialup/slmodem/files/slmodem-2.9.9a-alsa.patch b/net-dialup/slmodem/files/slmodem-2.9.9a-alsa.patch
new file mode 100644
index 000000000000..c46398f5cb0e
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.9a-alsa.patch
@@ -0,0 +1,24 @@
+From Jos Delbar <jos.delbar@ugent.be>
+Written and posted to gentoo bugzilla before 2.9.10 was released
+http://bugs.gentoo.org/60676
+
+--- slmodem-2.9.9a/modem/modem_cmdline.c	2005-01-19 14:34:16.009578193 +0100
++++ slmodem-2.9.9a-fixed/modem/modem_cmdline.c	2005-01-19 14:36:57.987589517 +0100
+@@ -103,7 +103,7 @@
+ 	{'v',"version","show version and exit"},
+ 	{'c',"country","default modem country name",MANDATORY,STRING,"USA"},
+ 	{ 0 ,"countrylist","show list of supported countries"},
+-	{'a',"alsa","ALSA mode (see README for howto)"},
++	{'a',"alsa","ALSA mode (see README for howto)",OPTIONAL,STRING,"hw:1"},
+ 	{'g',"group","Modem TTY group",MANDATORY,STRING,"uucp"},
+ 	{'p',"perm","Modem TTY permission",MANDATORY,INTEGER,"0660"},
+ 	{'n',"nortpriority","run with regular priority"},
+@@ -237,7 +237,7 @@
+ 		PR_INFO("ALSA support is not compiled in (see README for howto).\n");
+ 		exit(1);
+ #endif
+-		modem_dev_name = modem_alsa_dev_name;
++		modem_dev_name = opt_list[OPT_ALSA].arg_val;
+ 		use_alsa = 1;
+ 	}
+ 	if(opt_list[OPT_GROUP].found)
diff --git a/net-dialup/slmodem/slmodem-2.9.9a-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.9a-r1.ebuild
new file mode 100644
index 000000000000..e0cb4bfa18d4
--- /dev/null
+++ b/net-dialup/slmodem/slmodem-2.9.9a-r1.ebuild
@@ -0,0 +1,136 @@
+# 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.9a-r1.ebuild,v 1.1 2005/01/21 16:09:20 dsd 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/${P}.tar.gz"
+LICENSE="Smart-Link"
+SLOT="0"
+KEYWORDS="~x86 -*"
+IUSE="alsa usb"
+
+DEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )
+	>=sys-apps/sed-4"
+
+RDEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )"
+
+pkg_setup() {
+	MODULE_NAMES="slamr(extra:${S}/drivers)"
+	useq usb && MODULE_NAMES="${MODULE_NAMES} slusb(extra:${S}/drivers)"
+	BUILD_TARGETS="all"
+
+	local CONFIG_CHECK=""
+	if useq alsa; then
+		CONFIG_CHECK="${CONFIG_CHECK} SND"
+	fi
+	if useq usb; then
+		CONFIG_CHECK="${CONFIG_CHECK} USB"
+	fi
+
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-usb_endpoint_halted-gentoo.patch || die "failed to apply usb_endpoint patch"
+	epatch ${FILESDIR}/${P}-alsa.patch || die "failed to apply alsa patch"
+
+	convert_to_m drivers/Makefile
+}
+
+src_compile() {
+	local MAKE_PARAMS=""
+	if useq 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
+
+	dodoc COPYING Changes README
+
+	# Install /etc/{devfs,modules,init,conf}.d/slmodem files
+	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
+	insopts -m0755; insinto /etc/init.d/; newins ${FILESDIR}/${PN}-2.9.init ${PN}
+	sed -i -e "s/ALSACONF//g" -e "s/PCICONF//g" -e "s/USBCONF//g" ${D}/etc/conf.d/slmodem
+
+	# Make some devices if we aren't using devfs
+	# If we are using devfs, restart it
+	if [ -e ${ROOT}/dev/.devfsd ] ; then
+		# devfs
+		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
+	elif [ -e ${ROOT}/dev/.udev ] ; then
+		# udev
+		# check Symlink
+		dodir /etc/udev/rules.d/
+		echo 'KERNEL="slamr", NAME="slamr0"' > \
+			 ${D}/etc/udev/rules.d/55-${PN}.rules
+		echo 'KERNEL="slusb", NAME="slusb0"' >> \
+			 ${D}/etc/udev/rules.d/55-${PN}.rules
+		dodir /etc/udev/permissions.d
+		echo 'slamr*:root:dialout:0660' > \
+			${D}/etc/udev/permissions.d/55-${PN}.permissions
+	fi
+
+	#Create device nodes, add module aliases and install hotplug script
+	make -C drivers DESTDIR=${D} KERNEL_DIR="${ROOT}/usr/src/linux" install-devices
+	insinto /etc/modules.d/; insopts -m0644; newins ${FILESDIR}/${PN}-2.9.modules ${PN}
+	useq usb &&
+		( insinto /etc/hotplug/usb; insopts -m0755; newins ${FILESDIR}/slusb.hotplug slusb )
+
+	dodir /etc/hotplug/blacklist.d
+	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/55-${PN}
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Make some devices if we aren't using devfs
+	# If we are using devfs, restart it
+	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 $?
+	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/module.d/alsa"
+		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
+	fi
+}