Version bump based on the current sunrise ebuild, thanks to Jakub Moc <jakub@gentoo.org> (see bugs #178030 and #178173).

(Portage version: 2.1.2.3)

7 files changed, 230 insertions, 3 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 98e890bed0a3..acc1fe1b2916 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,11 +1,27 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.82 2007/05/06 08:12:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.83 2007/05/16 10:44:58 mrness Exp $
+
+*slmodem-2.9.11_pre20070505 (16 May 2007)
+
+  16 May 2007; Alin Năstac <mrness@gentoo.org> files/slmodem-modules,
+  +files/slmodem-ungrab-winmodem-hp500.patch, +files/slusb-udev.script,
+  +slmodem-2.9.11_pre20070505.ebuild:
+  Version bump based on the current sunrise ebuild, thanks to Jakub Moc
+  <jakub@gentoo.org> (see bugs #178030 and #178173).
 
   06 May 2007; Marius Mauch <genone@gentoo.org>
   slmodem-2.9.11_pre20061021-r2.ebuild:
   Replacing einfo with elog
 
+*slmodem-2.9.11_pre20070505 (16 May 2007)
+
+  16 May 2007; Alin Năstac <mrness@gentoo.org> files/slmodem-modules,
+  +files/slmodem-ungrab-winmodem-hp500.patch, +files/slusb-udev.script,
+  +slmodem-2.9.11_pre20070505.ebuild:
+  Version bump based on the current sunrise ebuild, thanks to Jakub Moc
+  <jakub@gentoo.org> (see bugs #178030 and #178173).
+
 *slmodem-2.9.11_pre20061021-r2 (14 Mar 2007)
 
   14 Mar 2007; Alin Năstac <mrness@gentoo.org> files/slmodem-initd,
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505
new file mode 100644
index 000000000000..18cce0d9d83c
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20070505
@@ -0,0 +1,6 @@
+MD5 150c089024501e93e640c898aba2debf slmodem-2.9.11-20070505.tar.gz 840019
+RMD160 9b052bd749a96771060a63f2f27289287bf06f38 slmodem-2.9.11-20070505.tar.gz 840019
+SHA256 616a5d8cefb2fadec085c19a17a8e38a8c51d836fe4c813e874636f915249adc slmodem-2.9.11-20070505.tar.gz 840019
+MD5 748bfc7387006293f9eddde119fa9d6f ungrab-winmodem-20070505.tar.gz 2254
+RMD160 51b71b203688004718826f23dc2485223d8b4a17 ungrab-winmodem-20070505.tar.gz 2254
+SHA256 9fd9287638f89c17733bb4a6c981b00446f0be18589a71f10f69fca5006a7781 ungrab-winmodem-20070505.tar.gz 2254
diff --git a/net-dialup/slmodem/files/slmodem-modules b/net-dialup/slmodem/files/slmodem-modules
index 3a49fedcaee6..c751b6ccb47a 100644
--- a/net-dialup/slmodem/files/slmodem-modules
+++ b/net-dialup/slmodem/files/slmodem-modules
@@ -2,3 +2,12 @@
 
 alias char-major-242 slamr
 alias char-major-243 slusb
+
+# If you see message like this in dmesg output:
+# device 10b9:5457 is grabbed by driver serial
+# then try uncommenting the two lines at the bottom, run update-modules and reboot.
+# After reboot, check dmesg output again, you should see a message like this instead:
+# device 10b9:5457 is grabbed by driver serial: try to release
+
+# install slamr modprobe --ignore-install ungrab-winmodem ; sleep 5 ; modprobe --ignore-install slamr
+# install slusb modprobe --ignore-install ungrab-winmodem ; sleep 5 ; modprobe --ignore-install slusb
diff --git a/net-dialup/slmodem/files/slmodem-ungrab-winmodem-hp500.patch b/net-dialup/slmodem/files/slmodem-ungrab-winmodem-hp500.patch
new file mode 100644
index 000000000000..3d4461a69539
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-ungrab-winmodem-hp500.patch
@@ -0,0 +1,27 @@
+--- ungrab-winmodem-20070505/ungrab-winmodem.c	2007-05-11 13:15:25.000000000 +0200
++++ ungrab-winmodem-20070505/ungrab-winmodem.c	2007-05-11 13:14:40.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <linux/pci.h>
+ #include <linux/kernel.h>
+ 
++#define PCI_DEVICE_ID_HP5457			0x266d
+ #define PCI_DEVICE_ID_ALI5457			0x5457
+ #define PCI_DEVICE_ID_ALI5459			0x5459
+ #define PCI_DEVICE_ID_ALI545A			0x545A
+@@ -28,6 +29,7 @@
+ #define PCI_VENDOR_ID_SMARTLINK_1		0x163c
+ #define PCI_VENDOR_ID_SMARTLINK_2		0x10a5
+ #define PCI_VENDOR_ID_SMARTLINK_3		0x2003
++#define PCI_VENDOR_ID_SMARTLINK_4		0x8086
+ #define PCI_DEVICE_ID_SL2800			0x2800
+ #define PCI_DEVICE_ID_SL1900			0x3052
+ #define PCI_DEVICE_ID_ND92XPA                   0x8800 /* ND92XPA */
+@@ -48,6 +50,8 @@
+ 	{PCI_VENDOR_ID_SMARTLINK, PCI_DEVICE_ID_SL2800, PCI_ANY_ID, PCI_ANY_ID },
+ 	/* 2003:8800 */
+ 	{PCI_VENDOR_ID_SMARTLINK_3, PCI_DEVICE_ID_ND92XPA, PCI_ANY_ID, PCI_ANY_ID },
++	/* 266d:8086 */
++	{PCI_VENDOR_ID_SMARTLINK_4, PCI_DEVICE_ID_HP5457, PCI_ANY_ID, PCI_ANY_ID },
+ 	/* pctel HSP1688 */
+ 	{ 0x134d, 0x2189, PCI_ANY_ID, PCI_ANY_ID },
+ 	{0,}
diff --git a/net-dialup/slmodem/files/slusb-udev.script b/net-dialup/slmodem/files/slusb-udev.script
new file mode 100644
index 000000000000..240dab2c9876
--- /dev/null
+++ b/net-dialup/slmodem/files/slusb-udev.script
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+script /etc/init.d/slmodem
+source /etc/conf.d/slmodem
+
+if [ -z "${USBMOD}" ] ; then 
+	MODULE="slusb"
+else
+	MODULE=${USBMOD}
+fi
+
+if $script --quiet status; then
+        $script stop
+elif
+    ! $script --quiet status; then
+        $script start
+fi
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r2.ebuild
index 65a7b5557eb1..d886cf17bcc3 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r2.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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_pre20061021-r2.ebuild,v 1.2 2007/05/06 08:12:57 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20061021-r2.ebuild,v 1.3 2007/05/16 10:44:58 mrness Exp $
 
 inherit eutils linux-mod multilib
 
@@ -146,7 +146,7 @@ pkg_postinst() {
 	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"
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20070505.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20070505.ebuild
new file mode 100644
index 000000000000..9c97b23da00e
--- /dev/null
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20070505.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2007 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_pre20070505.ebuild,v 1.1 2007/05/16 10:44:58 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-${PV/*_pre/}.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 )"
+
+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-${PV/*_pre/})"
+	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}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}"
+	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem-${PV/*_pre/}:" \
+		ungrab-winmodem-${PV/*_pre/}/Makefile
+	convert_to_m ungrab-winmodem-${PV/*_pre/}/Makefile
+
+	epatch "${FILESDIR}"/${PN}-ungrab-winmodem-hp500.patch
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P%%_*}-makefile.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 hotplug 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-${PV/*_pre}/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."
+}