Version bump, ebuild cleanup. Thanks to steev <threeway@gmail.com> for testing

(Portage version: 1.585-cvs)

6 files changed, 167 insertions, 23 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 5b66cdcbd2b8..aa2c5d431928 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.41 2005/01/28 14:20:04 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.42 2005/03/14 15:42:32 genstef Exp $
+
+*slmodem-2.9.9b (14 Mar 2005)
+
+  14 Mar 2005; Stefan Schweizer <genstef@gentoo.org> files/slmodem-2.9.conf,
+  files/slmodem-2.9.init, +slmodem-2.9.9b.ebuild:
+  Version bump, ebuild cleanup. Thanks to steev <threeway@gmail.com> for testing
 
   28 Jan 2005; Stefan Schweizer <genstef@gentoo.org>
   slmodem-2.9.9a-r2.ebuild:
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index ee9833cf781e..1deee67d7ead 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,11 +1,13 @@
 MD5 3637c7e3fe4b31081f97768434376210 slmodem-2.9.9a-r2.ebuild 3882
-MD5 557dd375e6b120aeff137f3be431514a ChangeLog 10065
+MD5 6031b133533ae1967e3dca86bf32e355 slmodem-2.9.9b.ebuild 3562
+MD5 8651d0793797b1254ad9b2ceb4b5eead ChangeLog 10305
 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 242152f0af5388e94c82cd188e7f6892 files/slmodem-2.9.init 2648
+MD5 1a0b854bbe34e01e918b855b7c81ffba files/slmodem-2.9.conf 649
+MD5 89e7a5f007843234838b490992cb0835 files/slmodem-2.9.init 2678
+MD5 abbaebc2245cf7223d65772abf782842 files/digest-slmodem-2.9.9b 66
 MD5 ef9ad53b66480e01974b9f183e4edbc8 files/digest-slmodem-2.9.9a-r2 66
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
 MD5 026f2e2fae1fbd999455b36630164a88 files/slmodem-usb_endpoint_halted-gentoo.patch 830
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9b b/net-dialup/slmodem/files/digest-slmodem-2.9.9b
new file mode 100644
index 000000000000..4ece36c078b4
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.9b
@@ -0,0 +1 @@
+MD5 5b9a5af9713e85717d3574264ade14d0 slmodem-2.9.9b.tar.gz 710319
diff --git a/net-dialup/slmodem/files/slmodem-2.9.conf b/net-dialup/slmodem/files/slmodem-2.9.conf
index 6a4db7760d0c..873dd33871c9 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.conf
+++ b/net-dialup/slmodem/files/slmodem-2.9.conf
@@ -1,11 +1,14 @@
 # Config file for /etc/init.d/slmodemd
 
 DEV=/dev/ttySL0
-COUNTRY=THAILAND
+COUNTRY=USA
 GROUP=dialout
+# the group should be kept in sync with:
+# /etc/devfs.d/slmodem (devfs)
+# /etc/udev/rules.d/55-slmodem.rules (udev)
 
 # The following symlink will be created if uncommented
-# LN_DEV=/dev/modem
+LN_DEV=/dev/modem
 
 # Raise priority to reduce modem dropouts
 NICE=-6
@@ -15,20 +18,15 @@ NICE=-6
 # The following sets the ALSA (alsasound) init script to
 # be a dependancy of the slmodem one. It does also provides
 # ALSA support.
-# ALSACONF MODULE=alsa
+# MODULE=alsa
 
 # The modem hardware slot
 # use "modem:0", "modem:1", etc.
-# ALSACONF HW_SLOT=modem:0
+# usually modem:1 is used
+# HW_SLOT=modem:1
 
 # Non-ALSA OPTIONS:
 
-# PCICONF MODULE=slamr
+# MODULE=slamr
 # or
-# USBCONF MODULE=slusb
-
-# this file must be kept in sync with:
-# /etc/devfs.d/slmodem (devfs)
-# /etc/modules.d/slmodem (devfs)
-# /etc/udev/rules.d/55-slmodem.rules (udev)
-# /etc/udev/permissions.d/55-slmodem.permissions (udev)
+# MODULE=slusb
diff --git a/net-dialup/slmodem/files/slmodem-2.9.init b/net-dialup/slmodem/files/slmodem-2.9.init
index e052ce0685d8..b54d9b11c1c6 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.init
+++ b/net-dialup/slmodem/files/slmodem-2.9.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.11 2005/01/22 02:33:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.12 2005/03/14 15:42:32 genstef Exp $
 
 depend() {
 	need logger
@@ -42,8 +42,8 @@ function loadsmodule {
 	ebegin "Waiting for ${MODULE} modem driver initialisation"
 	local COUNT=0
 	if [ "$RC_NOCOLOR" != "yes" ]; then 
-		echo -e "\e[A\e[49G   "
-		echo -ne "\e[A\e[49G"
+		echo -e "\e[A\e[52G   "
+		echo -ne "\e[A\e[52G"
 	fi
 	while [ ! -c ${MDEV} -a ${COUNT} -lt 20 ];
 	do
@@ -91,16 +91,17 @@ start() {
 
 stop() {
 	ebegin "Shutting down slmodemd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/slmodemd.pid && rm /var/run/slmodemd.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/slmodemd.pid
 	result=${?}
+	[ -e /var/run/slmodemd.pid ] && rm /var/run/slmodemd.pid
 	unlink ${LN_DEV} 2> /dev/null
 	eend ${result}
 	if [ ! "${MODULE}" == "alsa" ];
 	then
 		ebegin "Waiting for ${MODULE} modem driver unload"
 		if [ "$RC_NOCOLOR" != "yes" ]; then
-			echo -e "\e[A\e[43G   "
-			echo -ne "\e[A\e[43G"
+			echo -e "\e[A\e[44G   "
+			echo -ne "\e[A\e[44G"
 		fi
 		for ((a=0,result=1; result==1 && a <= 5 ; a++))
 		do
diff --git a/net-dialup/slmodem/slmodem-2.9.9b.ebuild b/net-dialup/slmodem/slmodem-2.9.9b.ebuild
new file mode 100644
index 000000000000..b1c5dbb1e588
--- /dev/null
+++ b/net-dialup/slmodem/slmodem-2.9.9b.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.9b.ebuild,v 1.1 2005/03/14 15:42:32 genstef 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"
+
+RDEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	MODULE_NAMES="slamr(net:${S}/drivers)"
+	if useq usb; then
+		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
+		CONFIG_CHECK="USB"
+	fi
+	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
+	BUILD_TARGETS="all"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/slmodem-2.9.9a-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
+
+	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 useq 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.modules ${PN}
+	if useq 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/55-${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 COPYING Changes README
+}
+
+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/module.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."
+
+	# Fixing /var/lock permissions
+	chmod 774 ${ROOT}/var/lock
+}