old version cleanout. 2.9.10-r1 stable. fixes to bugs #60676 and #71498

11 files changed, 34 insertions, 608 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index e9e329f4f596..ffaeac9fe9c3 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.28 2004/10/24 20:57:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.29 2004/12/05 09:28:29 dragonheart Exp $
+
+  05 Dec 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  -files/slmodem-2.9.9-makefile-fixup.patch, files/slmodem-2.9.conf,
+  files/slmodem-2.9.init, slmodem-2.9.10-r1.ebuild, -slmodem-2.9.10.ebuild,
+  -slmodem-2.9.9-r2.ebuild:
+  Old version cleanout. Latest version stable to remove use of kmod eclass. Bug
+  #71498 (file permission) problem fixed thanks to Urs Joss <tschenturs@gmx.ch>.
+  Bug #60676 alsa compatibility problem fixed thanks to Jos Delbar
+  <jos.delbar@ugent.be>. Added herd dialup to maintaince metadata.xml
 
   25 Oct 2004; Daniel Black <dragonheart@gentoo.org>
   -files/slmodem-2.7.14-makefile-fixup.patch, -files/slmodem-2.7.devfs,
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index d7123cd8f29f..1b073334a4ec 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,24 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7faf41f1aa59e6b8a1673f106ffac1e1 metadata.xml 523
-MD5 e31d9e58907ce4459cd9f117004f1b57 ChangeLog 6655
-MD5 d5d2b6c197ae9d40d4e3326e2f1b1dd5 slmodem-2.9.9-r2.ebuild 4335
-MD5 d087a4c2817309c5060154ad7840a463 slmodem-2.9.10.ebuild 4333
-MD5 9653472eb8c2bd13526f03eb9790502c slmodem-2.9.10-r1.ebuild 3931
-MD5 43dee264075d4262df5388ce1f055929 files/slmodem-2.9.conf 707
+MD5 b2d3e939b5d7acc0eae9e72d54ae1038 metadata.xml 492
+MD5 232c7012683e703e7400150bd276a427 ChangeLog 7194
+MD5 4713d0f8241186895d9e043b69a2d777 slmodem-2.9.10-r1.ebuild 3969
+MD5 88febad767b1d4026e75aaf256b81857 files/slmodem-2.9.conf 810
+MD5 62f64eafa8437b4721f3b13ad9e99ed1 files/slmodem-2.9.init 2656
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
-MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10 66
-MD5 9ae4e594075f43c76a7067fa8004095a files/digest-slmodem-2.9.9-r2 65
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
-MD5 5c0b5dfce1ad5bd98a79d8307faf584d files/slmodem-2.9.init 2659
 MD5 a358a1ca75aad86c0d7a059da089bc58 files/slmodem-2.9.10-makefile-fixup.patch 6229
 MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r1 66
-MD5 a1b37267647bbb45a01facc3b807ccff files/slmodem-2.9.9-makefile-fixup.patch 6328
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBfBcxmdTrptrqvGERAuKZAJ42jcsg9t4ajBWjLRL6EJ/mC9CgcgCfSLIz
-ls6J4Dwf5j8HoJ6VONkdjhE=
-=aWjn
------END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.10 b/net-dialup/slmodem/files/digest-slmodem-2.9.10
deleted file mode 100644
index b6aff29497e8..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbc4918f2ee9ed4952d3f4309d364b35 slmodem-2.9.10.tar.gz 806884
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9-r2 b/net-dialup/slmodem/files/digest-slmodem-2.9.9-r2
deleted file mode 100644
index 099d04f8b31f..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b9eb4b43d8428024d9bb2fa3db4d56ea slmodem-2.9.9.tar.gz 708051
diff --git a/net-dialup/slmodem/files/slmodem-2.9.9-makefile-fixup.patch b/net-dialup/slmodem/files/slmodem-2.9.9-makefile-fixup.patch
deleted file mode 100644
index 94d1326616f0..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.9-makefile-fixup.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-diff -ru slmodem-2.9.9.orig/Makefile slmodem-2.9.9/Makefile
---- slmodem-2.9.9.orig/Makefile	2004-02-03 02:13:43.000000000 +0930
-+++ slmodem-2.9.9/Makefile	2004-07-25 01:07:34.504873696 +0930
-@@ -13,7 +13,9 @@
- #
- ###########################################################################
- 
--KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
-+KERNEL_VER:=$(shell uname -r)
-+KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build
-+KERNEL_OUTPUT_DIR:=$(KERNEL_DIR)
- 
- # tools
- INSTALL:=install
-@@ -28,21 +30,25 @@
- 	$(RM) -rf ${DESTDIR}/var/lib/slmodem
- 	$(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem
- 
-+install-test:
-+	$(INSTALL) -D -m 755 modem/modem_test ${DESTDIR}/usr/sbin/modem_test
-+
- uninstall: uninstall-drivers
- 	$(RM) ${DESTDIR}/usr/sbin/slmodemd
- 	$(RM) -rf ${DESTDIR}/var/lib/slmodem
- 
- drivers:
--	$(MAKE) -C drivers KERNEL_DIR=$(KERNEL_DIR)
-+	$(MAKE) -C drivers
- 
- install-drivers:
--	$(MAKE) install -C drivers KERNEL_DIR=$(KERNEL_DIR)
-+	$(MAKE) install -C drivers
-+
- uninstall-drivers:
--	$(MAKE) uninstall -C drivers KERNEL_DIR=$(KERNEL_DIR)
-+	$(MAKE) uninstall -C drivers
- 
- # misc rules
- sub-dirs:= modem drivers
--.PHONY: $(sub-dirs) all old clean dep install
-+.PHONY: $(sub-dirs) all old clean dep install install-drivers install-test uninstall-drivers
- clean dep: %: %-sub-dirs
- %-sub-dirs:
- 	$(foreach dir,$(sub-dirs),$(MAKE) -C $(dir) $(patsubst %-sub-dirs,%,$@) && ) echo "done."
-Only in slmodem-2.9.9/drivers: .amrmo_init.o.d
-Only in slmodem-2.9.9/drivers: .tmp_versions
-diff -ru slmodem-2.9.9.orig/drivers/Makefile slmodem-2.9.9/drivers/Makefile
---- slmodem-2.9.9.orig/drivers/Makefile	2003-12-22 06:45:54.000000000 +0930
-+++ slmodem-2.9.9/drivers/Makefile	2004-07-25 01:11:40.158528664 +0930
-@@ -16,9 +16,17 @@
- #KBUILD_VERBOSE=1
- #export KBUILD_VERBOSE
- 
--KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
-+ifndef KERNEL_VER
-+KERNEL_VER:=$(shell uname -r)
-+endif
-+ifndef KERNEL_DIR
-+KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build
-+endif
-+ifndef KERNEL_OUTPUT_DIR
-+KERNEL_OUTPUT_DIR:=$(KERNEL_DIR)
-+endif
- 
--EXTRA_CFLAGS = -I$(obj) -I$(obj)/../modem
-+EXTRA_CFLAGS+= -I$(obj) -I$(obj)/../modem
- 
- obj-m := slamr.o slusb.o
- 
-@@ -28,39 +36,35 @@
- ifndef KERNELRELEASE
- ifndef KERNEL_VER
- 
--all install uninstall: kernel-ver
--	$(MAKE) $@ KERNEL_VER=$(shell ./kernel-ver)
-+all install uninstall:
-+	$(MAKE) $@
- 
- install: install-devices
- uninstall: remove-devices
- 
--kernel-ver::
-+kernel-ver:
- 	$(CC) -I$(KERNEL_DIR)/include -o $@ $@.c
- 
--dep:
--clean:
--	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~
--
- install-devices:
- 	mkdir -p ${DESTDIR}/dev
- 	$(foreach minor,0 1 2 3, \
- 	    mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n
- 	$(foreach minor,0 1 2 3, \
- 	    mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n
-+
- remove-devices:
--	$(foreach minor,0 1 2 3, \
--	    $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n
--	$(foreach minor,0 1 2 3, \
--	    $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n
-+	    $(RM) ${DESTDIR}/dev/slamr[0-3] ; ) echo -n
-+	    $(RM) ${DESTDIR}/dev/slusb[0-3] ; ) echo -n
- 
- else
- ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4)
-+# 2.4 kernel
- 
- slusb-objs:= old_st7554.o
- obj:=.
- module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc
- 
--CFLAGS:= -Wall -pipe -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include
-+EXTRA_CFLAGS+=  -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include
- 
- all: $(obj-m)
- 
-@@ -69,13 +73,17 @@
- slamr.o slusb.o:
- 	$(LD) -r -o $@ $^
- 
--install: uninstall-old
-+install: install-modules
-+	mkdir -p $(DESTDIR)/etc && \
-+	cp /etc/modules.conf $(DESTDIR)/etc/modules.conf.slamr && \
-+	echo 'alias char-major-212 slamr' >> $(DESTDIR)/etc/modules.conf && \
-+	echo 'alias char-major-213 slusb' >> $(DESTDIR)/etc/modules.conf 
-+	/sbin/depmod -a
-+
-+install-modules: 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-212 slamr' >> /etc/modules.conf && \
--	    echo 'alias char-major-213 slusb' >> /etc/modules.conf 
--	/sbin/depmod -a
-+
- uninstall:
- 	/sbin/modprobe -r slamr slusb
- 	cp /etc/modules.conf /etc/modules.conf.slamr && \
-@@ -83,6 +91,7 @@
- 	$(RM) $(module-dir)/slamr.o
- 	$(RM) $(module-dir)/slusb.o
- 	/sbin/depmod -a
-+
- uninstall-old:
- 	$(RM) $(module-dir)/slmdm.o \
-               $(module-dir)/slfax.o \
-@@ -94,15 +103,18 @@
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$@) -o $@ -c $<
- 
- else
-+# 2.6 Kernel
-+
-+EXTRA_CFLAGS+=-I $(KERNEL_INCLUDE_DIR) -I .
- 
- module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/extra
- 
- all:
--	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd)
-+	$(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd) O=$(KERNEL_OUTPUT_DIR)
- install:
- 	install -D -m 644 slamr.ko $(module-dir)/slamr.ko
- 	install -D -m 644 slusb.ko $(module-dir)/slusb.ko
--	/sbin/depmod -a
-+#	/sbin/depmod -a
- uninstall:
- 	modprobe -r slamr ; echo -n
- 	modprobe -r slusb ; echo -n
-@@ -114,6 +126,12 @@
- endif
- endif
- 
-+dep:
-+clean:
-+	$(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~
-+
- $(obj)/amrlibs.o:
- 	echo "$@ done"
- 
-+
-+.PHONY: install install-modules uninstall-old install-devices remove-devices  all
-diff -ru slmodem-2.9.9.orig/modem/Makefile slmodem-2.9.9/modem/Makefile
---- slmodem-2.9.9.orig/modem/Makefile	2003-11-20 22:20:47.000000000 +0930
-+++ slmodem-2.9.9/modem/Makefile	2004-07-25 01:07:34.539868376 +0930
-@@ -16,8 +16,7 @@
- CC:= gcc
- RM:= rm -f
- 
--CFLAGS:= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM
--
-+EXTRA_CFLAGS+=  -I. -DCONFIG_DEBUG_MODEM
- 
- modem-objs:= \
- 	modem.o modem_datafile.o modem_at.o modem_timer.o \
-@@ -32,13 +31,13 @@
- modem_test: modem_test.o modem_cmdline.o $(modem-objs) $(dp-objs) dsplibs.o $(sysdep-objs)
- 
- #SUPPORT_ALSA:=1
--ifdef SUPPORT_ALSA
-+ifeq ($(SUPPORT_ALSA),1)
- slmodemd: -lasound
--CFLAGS+= -DSUPPORT_ALSA=1
-+EXTRA_CFLAGS+= -DSUPPORT_ALSA=1
- endif
- 
- slmodemd modem_test:
--	$(CC) -o $@ $^
-+	$(CC) $(EXTRA_CFLAGS) -o $@ $^
- 
- clean:
- 	$(RM) slmodemd modem_test modem_main.o modem_cmdline.o modem_test.o $(modem-objs) $(dp-objs) $(sysdep-objs)
-Only in slmodem-2.9.9: workdir
diff --git a/net-dialup/slmodem/files/slmodem-2.9.conf b/net-dialup/slmodem/files/slmodem-2.9.conf
index 221a47f1bb9b..8021eab75f64 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.conf
+++ b/net-dialup/slmodem/files/slmodem-2.9.conf
@@ -17,8 +17,10 @@ NICE=-6
 # ALSA support.
 # ALSACONF MODULE=alsa
 
-# The hardware slot
-# ALSACONF HW_SLOT=0
+# The modem hardware slot
+# For ALSA <  1.0.6, use "hw:0", "hw:1", etc.
+# For ALSA >= 1.0.6, replace "hw" with "modem".
+# ALSACONF HW_SLOT=hw:0
 
 # Non-ALSA OPTIONS:
 
diff --git a/net-dialup/slmodem/files/slmodem-2.9.init b/net-dialup/slmodem/files/slmodem-2.9.init
index e801ac9f94e5..9b31d19f92a2 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
 # 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.9 2004/08/13 12:59:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.10 2004/12/05 09:28:29 dragonheart Exp $
 
 depend() {
 	need logger
@@ -23,7 +23,7 @@ function loadsalsa {
 	ebegin "Starting slmodemd for ${DEV}"
 	start-stop-daemon --start --background --nicelevel=${NICE} --make-pidfile \
 		--pidfile /var/run/slmodemd.pid --startas /usr/sbin/slmodemd \
-		-- -country=${COUNTRY} -g=${GROUP} --alsa hw:${HW_SLOT}
+		-- -country=${COUNTRY} -g=${GROUP} --alsa ${HW_SLOT}
 	return ${?}
 }
 
diff --git a/net-dialup/slmodem/metadata.xml b/net-dialup/slmodem/metadata.xml
index b5130ecfa042..0f08a05e384c 100644
--- a/net-dialup/slmodem/metadata.xml
+++ b/net-dialup/slmodem/metadata.xml
@@ -3,13 +3,17 @@
 <pkgmetadata>
 <herd>net-dialup</herd>
 <maintainer>
-<email>spyderous@gentoo.org</email>
-<name>Donnie Berkholz</name>
-<description>Has PCI hardware for non ebuild/compile errors</description>
+	<email>net-dialup@gentoo.org</email>
+	<name>Net-dialup herd</name>
 </maintainer>
 <maintainer>
-<email>dragonheart@gentoo.org</email>
-<name>Daniel Black</name>
-<description>Strained brain getting kmod eclass compliant. Will fix ebuild/script errors</description>
+	<email>spyderous@gentoo.org</email>
+	<name>Donnie Berkholz</name>
+	<description>Has PCI hardware for non ebuild/compile errors</description>
+</maintainer>
+<maintainer>
+	<email>dragonheart@gentoo.org</email>
+	<name>Daniel Black</name>
+	<description>Will fix ebuild/script errors</description>
 </maintainer>
 </pkgmetadata>
diff --git a/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
index 26579171b391..886bdbc49615 100644
--- a/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild,v 1.2 2004/10/24 20:57:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild,v 1.3 2004/12/05 09:28:29 dragonheart Exp $
 
 inherit kernel-mod eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.smlink.com/"
 SRC_URI="http://www.smlink.com/main/down/${P}.tar.gz"
 LICENSE="Smart-Link"
 SLOT="0"
-KEYWORDS="~x86 -*"
+KEYWORDS="x86 -*"
 IUSE="alsa usb"
 
 DEPEND="virtual/libc
@@ -90,6 +90,7 @@ src_install() {
 	# devfs
 		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
 		insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.modules ${PN}
+		chmod 644 ${D}/etc/modules.d/slmodem
 	elif [ -e ${ROOT}/dev/.udev ] ; then
 	# udev
 		# check Symlink
diff --git a/net-dialup/slmodem/slmodem-2.9.10.ebuild b/net-dialup/slmodem/slmodem-2.9.10.ebuild
deleted file mode 100644
index 3d5acb71d6ca..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.10.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.10.ebuild,v 1.1 2004/09/23 22:59:28 dragonheart Exp $
-
-inherit kmod eutils
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://www.smlink.com/"
-SRC_URI="http://www.smlink.com/main/down/${P}.tar.gz"
-LICENSE="Smart-Link"
-SLOT="${KV}"
-KEYWORDS="x86 -*"
-IUSE="alsa usb"
-
-DEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
-	virtual/os-headers"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )"
-
-src_unpack() {
-
-	ewarn "This ebuild is sensive to use flags (usb, alsa)."
-	ewarn "Please select approprately based on your hardware."
-	ewarn "use -usb if you have a PCI modem"
-
-	# Unpack and set some variables
-	kmod_src_unpack
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile-fixup.patch
-}
-
-src_compile() {
-
-	#[ -d ${KV_OUTPUT} ] || die "Build kernel ${KV_VERSION_FULL} first"
-
-	export KERNEL_OUTPUT_DIR=${S}/workdir
-
-	if is_kernel 2 5 || is_kernel 2 6
-	then
-		unset ARCH
-	fi
-
-	if use alsa
-	then
-		export SUPPORT_ALSA=1
-	else
-		export SUPPORT_ALSA=0
-	fi
-
-	mkdir ${S}/workdir
-
-	emake -C ${S} \
-		KERNEL_VER=${KV_VERSION_FULL} \
-		KERNEL_DIR=${KV_OUTPUT} \
-		KERNEL_INCLUDES=/usr/include/linux \
-		all || die "Failed to compile driver"
-
-}
-
-#src_test() {
-#	cd modem
-#	emake modem_test
-#	./modem_test || die "failed modem test"
-#
-#	if use usb
-#	then
-#	# USB modem test
-#	else
-#	# PCI modem test
-#	fi
-#}
-
-src_install() {
-	unset ARCH
-	emake DESTDIR=${D} \
-		KERNEL_VER=${KV_VERSION_FULL} \
-		install-drivers install-test\
-		|| die "driver install failed"
-
-	mv ${D}/usr/sbin/modem_test ${D}/usr/sbin/slmodem_test
-
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /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}
-
-	if use alsa
-	then
-		sed -i -e "s/# ALSACONF //g" ${D}/etc/conf.d/slmodem
-	else
-		sed -i -e "s/# NONALSACONF //g" ${D}/etc/conf.d/slmodem
-		if use usb
-		then
-			sed -i -e "s/# USBCONF //g" ${D}/etc/conf.d/slmodem
-		else
-			sed -i -e "s/# PCICONF //g" ${D}/etc/conf.d/slmodem
-		fi
-	fi
-	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}
-		insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.modules ${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
-	else
-		make -C drivers DESTDIR=${D} KERNELRELEASE=1 KERNEL_VER=${KV_VERSION_FULL} install-devices
-	fi
-
-	dodir /etc/hotplug
-
-	#if [ -r ${ROOT}/etc/hotplug/blacklist ]
-	#then
-	#	cp ${ROOT}/etc/hotplug/blacklist ${D}/etc/hotplug/
-	#fi
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/55-${PN}
-}
-
-pkg_postinst() {
-	kmod_pkg_postinst
-
-	depmod -a
-
-	# 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 0
-		einfo "modules-update to complete configuration."
-
-	elif [ -e ${ROOT}/dev/.udev ]
-	then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend 0
-	fi
-
-	echo
-
-	einfo "You must edit /etc/conf.d/${PN} for your configuration"
-
-	ewarn "To avoid problems add slusb/slamr to /etc/hotplug/blacklist"
-
-	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
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.9-r2.ebuild b/net-dialup/slmodem/slmodem-2.9.9-r2.ebuild
deleted file mode 100644
index 1f1a1d7e9488..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.9-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9-r2.ebuild,v 1.4 2004/08/19 23:40:19 dragonheart Exp $
-
-inherit kmod eutils
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://www.smlink.com/"
-SRC_URI="http://www.smlink.com/main/down/${P}.tar.gz"
-LICENSE="Smart-Link"
-SLOT="${KV}"
-KEYWORDS="x86 -*"
-IUSE="alsa usb"
-
-DEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
-	virtual/os-headers"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )"
-
-src_unpack() {
-
-	ewarn "This ebuild is sensive to use flags (usb, alsa)."
-	ewarn "Please select approprately based on your hardware."
-	ewarn "use -usb if you have a PCI modem"
-
-	# Unpack and set some variables
-	kmod_src_unpack
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile-fixup.patch
-}
-
-src_compile() {
-
-	#[ -d ${KV_OUTPUT} ] || die "Build kernel ${KV_VERSION_FULL} first"
-
-	export KERNEL_OUTPUT_DIR=${S}/workdir
-
-	if is_kernel 2 5 || is_kernel 2 6
-	then
-		unset ARCH
-	fi
-
-	if use alsa
-	then
-		export SUPPORT_ALSA=1
-	else
-		export SUPPORT_ALSA=0
-	fi
-
-	mkdir ${S}/workdir
-
-	emake -C ${S} \
-		KERNEL_VER=${KV_VERSION_FULL} \
-		KERNEL_DIR=${KV_OUTPUT} \
-		KERNEL_INCLUDES=/usr/include/linux \
-		all || die "Failed to compile driver"
-
-}
-
-#src_test() {
-#	cd modem
-#	emake modem_test
-#	./modem_test || die "failed modem test"
-#
-#	if use usb
-#	then
-#	# USB modem test
-#	else
-#	# PCI modem test
-#	fi
-#}
-
-src_install() {
-	unset ARCH
-	emake DESTDIR=${D} \
-		KERNEL_VER=${KV_VERSION_FULL} \
-		install-drivers install-test\
-		|| die "driver install failed"
-
-	mv ${D}/usr/sbin/modem_test ${D}/usr/sbin/slmodem_test
-
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /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}
-
-	if use alsa
-	then
-		sed -i -e "s/# ALSACONF //g" ${D}/etc/conf.d/slmodem
-	else
-		sed -i -e "s/# NONALSACONF //g" ${D}/etc/conf.d/slmodem
-		if use usb
-		then
-			sed -i -e "s/# USBCONF //g" ${D}/etc/conf.d/slmodem
-		else
-			sed -i -e "s/# PCICONF //g" ${D}/etc/conf.d/slmodem
-		fi
-	fi
-	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}
-		insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.modules ${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
-	else
-		make -C drivers DESTDIR=${D} KERNELRELEASE=1 KERNEL_VER=${KV_VERSION_FULL} install-devices
-	fi
-
-	dodir /etc/hotplug
-
-	#if [ -r ${ROOT}/etc/hotplug/blacklist ]
-	#then
-	#	cp ${ROOT}/etc/hotplug/blacklist ${D}/etc/hotplug/
-	#fi
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/55-${PN}
-}
-
-pkg_postinst() {
-	kmod_pkg_postinst
-
-	depmod -a
-
-	# 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 0
-		einfo "modules-update to complete configuration."
-
-	elif [ -e ${ROOT}/dev/.udev ]
-	then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend 0
-	fi
-
-	echo
-
-	einfo "You must edit /etc/conf.d/${PN} for your configuration"
-
-	ewarn "To avoid problems add slusb/slamr to /etc/hotplug/blacklist"
-
-	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
-}