Add extra slmodemd options (#156457).

(Portage version: 2.1.1-r1)
 (Signed Manifest commit)

3 files changed, 22 insertions, 183 deletions

diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index ea777036351a..990de3804828 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -9,14 +9,14 @@ AUX slmodem-2.9.11-makefile.patch 872 RMD160 2e0c60d8bdf9d9c936c20d7941030fe3fc4
 MD5 ead92ab897f69fd1b9fc97c4c0e305e1 files/slmodem-2.9.11-makefile.patch 872
 RMD160 2e0c60d8bdf9d9c936c20d7941030fe3fc439402 files/slmodem-2.9.11-makefile.patch 872
 SHA256 56518c7fa8ce442613ff9f23d87cbabe83ddb1fc21d10ae11dc8e7fd57610189 files/slmodem-2.9.11-makefile.patch 872
-AUX slmodem-confd 649 RMD160 7d3f89e8ad1831e0730924e421ab643368406c7c SHA1 627d9c8afb37275b0e147868f57bff2c25ebd0df SHA256 0f6cf3b88900d0b2717c7df33debd5247c46849fc3d92bc54cf84d4eb0b46bff
-MD5 1a0b854bbe34e01e918b855b7c81ffba files/slmodem-confd 649
-RMD160 7d3f89e8ad1831e0730924e421ab643368406c7c files/slmodem-confd 649
-SHA256 0f6cf3b88900d0b2717c7df33debd5247c46849fc3d92bc54cf84d4eb0b46bff files/slmodem-confd 649
-AUX slmodem-initd 2258 RMD160 692339982d8b09870c81ab04b9e07a7e7397b028 SHA1 6b683d06c456c9d912fc5a48dd7763115ae176fe SHA256 5649c0a14df8b7513dde484a1d0445cb13fde3f5e02118baadff7962099aa710
-MD5 f466bf22d970d1f4ea3df4c9a5573bdb files/slmodem-initd 2258
-RMD160 692339982d8b09870c81ab04b9e07a7e7397b028 files/slmodem-initd 2258
-SHA256 5649c0a14df8b7513dde484a1d0445cb13fde3f5e02118baadff7962099aa710 files/slmodem-initd 2258
+AUX slmodem-confd 800 RMD160 7c5460263589cb8b384353484d08b100bdc5b8d2 SHA1 5a734d9121aed93aa40b9620a452b9ec08e30461 SHA256 f430a8bb00aa4ee3cda98ad9fee99125e16727064d0568709740b710ed3525c8
+MD5 e5bd1ccfecc078dc1797bd16991f36ba files/slmodem-confd 800
+RMD160 7c5460263589cb8b384353484d08b100bdc5b8d2 files/slmodem-confd 800
+SHA256 f430a8bb00aa4ee3cda98ad9fee99125e16727064d0568709740b710ed3525c8 files/slmodem-confd 800
+AUX slmodem-initd 2290 RMD160 685d838f6bfb9a1a58333823bd26c9449f9b35d8 SHA1 1f7d449f7aa9cf16d501c310da93d1009bfe58db SHA256 fb87fca93588201a2659293dfa3df005f32e8d13b7cd7158fb7a69262306810f
+MD5 7d6ed4099ad33788dbac6a8a23f4f143 files/slmodem-initd 2290
+RMD160 685d838f6bfb9a1a58333823bd26c9449f9b35d8 files/slmodem-initd 2290
+SHA256 fb87fca93588201a2659293dfa3df005f32e8d13b7cd7158fb7a69262306810f files/slmodem-initd 2290
 AUX slmodem-modules 106 RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e SHA1 933fbb37e99e26b838d508c177cf69097903c36b SHA256 0ae1432fbae6e517190a841a6ae09806f24c16614e845d2e814a568285d96a7f
 MD5 e91d1df68be76c531a8514dba77c1886 files/slmodem-modules 106
 RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e files/slmodem-modules 106
@@ -27,25 +27,25 @@ RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 files/slusb.hotplug 262
 SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed files/slusb.hotplug 262
 DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA1 bacd94800a83c86cc872c6afa75dfb3c90828815 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172
 DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA1 d8c48969fd840b4f7b15f9d6b269470a44e4eed0 SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11
-EBUILD slmodem-2.9.11_pre20051101-r2.ebuild 4647 RMD160 9a996fe41cbe6b93ca8f4d3b77487540b6fe8b6a SHA1 7739782ed8a2453a206623169f920a9d7fb3edbc SHA256 33b9245fafd37e980e2bd340212120010e85f6d65bf5047c0a2aa324f198450f
-MD5 b617b477231b40dfc43cfa09dd3e7cb6 slmodem-2.9.11_pre20051101-r2.ebuild 4647
-RMD160 9a996fe41cbe6b93ca8f4d3b77487540b6fe8b6a slmodem-2.9.11_pre20051101-r2.ebuild 4647
-SHA256 33b9245fafd37e980e2bd340212120010e85f6d65bf5047c0a2aa324f198450f slmodem-2.9.11_pre20051101-r2.ebuild 4647
-MISC ChangeLog 16141 RMD160 2ad0bc5424e2bfb7fb6a55de60f813d075ddd5aa SHA1 418c1e4c226f4c2da8f48b90d86dbdef3533deea SHA256 0bf6d7a1a80fe3b898a484620574c90bc20b9f37f25da1253e117208d3a7b75d
-MD5 48f4439b642c7e1e26a380c968718e18 ChangeLog 16141
-RMD160 2ad0bc5424e2bfb7fb6a55de60f813d075ddd5aa ChangeLog 16141
-SHA256 0bf6d7a1a80fe3b898a484620574c90bc20b9f37f25da1253e117208d3a7b75d ChangeLog 16141
+EBUILD slmodem-2.9.11_pre20051101-r3.ebuild 4647 RMD160 2dfa39e11c3106b4b82f4e4caecd3343a21e8643 SHA1 91f7e55b5d0f1b981b2b350aa32c1d45e872f268 SHA256 229aeb81b1537c69bafe5a4fc7034badb976b36f08409b77095347d2dd513b57
+MD5 1f8422dd189f180c170dce93a715eee7 slmodem-2.9.11_pre20051101-r3.ebuild 4647
+RMD160 2dfa39e11c3106b4b82f4e4caecd3343a21e8643 slmodem-2.9.11_pre20051101-r3.ebuild 4647
+SHA256 229aeb81b1537c69bafe5a4fc7034badb976b36f08409b77095347d2dd513b57 slmodem-2.9.11_pre20051101-r3.ebuild 4647
+MISC ChangeLog 16400 RMD160 14b19fdae9c777181111bb9341fdfbed0f968264 SHA1 196110a36b3665ef61814dc675f4f572978b541b SHA256 7ba5c09dfc597a83decedc06300a3c64cec86169b19807d2d6d354d96e9b0148
+MD5 28c370f5e1c2e9663f1cc00f038f42b9 ChangeLog 16400
+RMD160 14b19fdae9c777181111bb9341fdfbed0f968264 ChangeLog 16400
+SHA256 7ba5c09dfc597a83decedc06300a3c64cec86169b19807d2d6d354d96e9b0148 ChangeLog 16400
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
 SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
-MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101-r2 512
-RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101-r2 512
-SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101-r2 512
+MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101-r3 512
+RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101-r3 512
+SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101-r3 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXxFp3sf9c6kjmR8RApf6AJwOgSU2A7Ro4hScU89lEW4EmQytXgCfbmOi
-s+C615G5NPU59RlPBkR0dGE=
-=Ue+/
+iD8DBQFFb/0K3sf9c6kjmR8RAprjAJ96rhTK0sIN1VAtYGf7JXUE6nN6VQCfWTZm
+6ipUGBYMocguW1wfAYe/jYE=
+=N8G1
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r2 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r2
deleted file mode 100644
index 047a97ea184a..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56bb1ddf621b2fe26caf746aed0ac26f slmodem-2.9.11-20051101.tar.gz 833644
-RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 slmodem-2.9.11-20051101.tar.gz 833644
-SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172 slmodem-2.9.11-20051101.tar.gz 833644
-MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872
-RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf ungrab-winmodem.tar.gz 1872
-SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 ungrab-winmodem.tar.gz 1872
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r2.ebuild
deleted file mode 100644
index 7e2b55e684e3..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2006 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_pre20051101-r2.ebuild,v 1.3 2006/11/18 13:57:48 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.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)"
-	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}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		"${WORKDIR}/ungrab-winmodem/Makefile"
-	convert_to_m "${WORKDIR}/ungrab-winmodem/Makefile"
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P%%_*}-makefile.patch"
-	epatch "${FILESDIR}/${P%%_*}-kernel-2.6.18.patch"
-	cd 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 /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/${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"
-		if use usb; then
-			echo 'KERNEL=="slusb", NAME="slusb0" GROUP="dialout"' >> \
-				 "${D}/etc/udev/rules.d/55-${PN}.rules"
-		fi
-	fi
-
-	dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt"
-}
-
-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/modules.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."
-	einfo
-	einfo "If you see the following in dmesg:"
-	echo slamr: device 10b9:5457 is grabbed by driver serial
-	einfo "you need to modprobe ungrab-winmodem before slamr"
-}