removed old 2.9.9-r1. Made slmodem-2.9.9-r2 x86 stabled. KEYWORD="x86 -*" due to 2 precompiled object files in the distribution.

5 files changed, 16 insertions, 173 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 99c2c2073bd9..5e36cb79e61c 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,14 @@
 # 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.23 2004/08/15 02:47:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.24 2004/08/19 23:40:19 dragonheart Exp $
+
+  20 Aug 2004; Daniel Black <dragonheart@gentoo.org> -slmodem-2.9.9-r1.ebuild,
+  slmodem-2.9.9-r2.ebuild:
+  removed old 2.9.9-r1. Made slmodem-2.9.9-r2 x86 stabled. Unfortunately due to
+  drivers/amrlibs.o and modem/dsplibs.o being precompiled this program won't
+  work on other archs. Please direct complaints to vendor
+  (sales-corporate@smlink.com, linux-support@smlink.com). Mine was ignored but
+  there is power in numbers.
 
   15 Aug 2004; Daniel Black <dragonheart@gentoo.org> slmodem-2.9.9-r2.ebuild:
   snd-intel8x0m added to hotplug blacklist due to it breaking suspend-to-ram.
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index ecbb314e5bf6..4f5c27ea336f 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -3,16 +3,14 @@ Hash: SHA1
 
 MD5 7faf41f1aa59e6b8a1673f106ffac1e1 metadata.xml 523
 MD5 39a6e7fcda2ee23817e894ed009e7ba7 slmodem-2.7.14.ebuild 1511
-MD5 42c6fc2da2ef0bf0a2f68bad6c9607e6 ChangeLog 5186
-MD5 78259439fc399e5842dc7367b2ed1f38 slmodem-2.9.9-r2.ebuild 4333
-MD5 da09cacea9ef6ab797c9872e18fecada slmodem-2.9.9-r1.ebuild 3792
+MD5 c490649057672f2ccb995d437b478eaf ChangeLog 5616
+MD5 d5d2b6c197ae9d40d4e3326e2f1b1dd5 slmodem-2.9.9-r2.ebuild 4335
 MD5 43dee264075d4262df5388ce1f055929 files/slmodem-2.9.conf 707
 MD5 04150d1eddd9774a7d1a70df93600e3c files/digest-slmodem-2.7.14 64
 MD5 5565553c8ddd949c38070e59ce64b90c files/slmodem-2.7.14-makefile-fixup.patch 1626
 MD5 24079d6e20ac945048a1c212f06772ce files/slmodem-2.7.devfs 431
 MD5 117ea746ee99218e673afc397038120d files/slmodem-2.7.modules 669
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
-MD5 9ae4e594075f43c76a7067fa8004095a files/digest-slmodem-2.9.9-r1 65
 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
@@ -20,7 +18,7 @@ MD5 a1b37267647bbb45a01facc3b807ccff files/slmodem-2.9.9-makefile-fixup.patch 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBHsgvmdTrptrqvGERAtrIAJsGJnb+kX1ViIUbCdiWn5BcgpJWCQCdFg2r
-Xfsp0RjIIW6v6zGoiGNzR+k=
-=5QpA
+iD8DBQFBJTgvmdTrptrqvGERArWMAKCBenaTtFnRQdqxtmVXtihLA1iFGACglyuM
+8H9doG3Hu2mL9iiSmt+KNhc=
+=dhqV
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9-r1 b/net-dialup/slmodem/files/digest-slmodem-2.9.9-r1
deleted file mode 100644
index 099d04f8b31f..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b9eb4b43d8428024d9bb2fa3db4d56ea slmodem-2.9.9.tar.gz 708051
diff --git a/net-dialup/slmodem/slmodem-2.9.9-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.9-r1.ebuild
deleted file mode 100644
index 7bfbf506b5e2..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.9-r1.ebuild
+++ /dev/null
@@ -1,162 +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-r1.ebuild,v 1.1 2004/08/02 02:51:09 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() {
-	# 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", SYMLINK="modem"' > \
-			 ${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
-
-}
-
-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"
-
-	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
index 29ae458f0eca..1f1a1d7e9488 100644
--- a/net-dialup/slmodem/slmodem-2.9.9-r2.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.9-r2.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.9-r2.ebuild,v 1.3 2004/08/15 02:47:00 dragonheart Exp $
+# $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
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.smlink.com/"
 SRC_URI="http://www.smlink.com/main/down/${P}.tar.gz"
 LICENSE="Smart-Link"
 SLOT="${KV}"
-KEYWORDS="~x86"
+KEYWORDS="x86 -*"
 IUSE="alsa usb"
 
 DEPEND="virtual/libc