Fixed ebuild when USE=-alsa. bug #68179. Removed old version

8 files changed, 15 insertions, 152 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index acd5d00f8180..e9e329f4f596 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2004/10/16 02:21:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.28 2004/10/24 20:57:15 dragonheart Exp $
+
+  25 Oct 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/slmodem-2.7.14-makefile-fixup.patch, -files/slmodem-2.7.devfs,
+  -files/slmodem-2.7.modules, -slmodem-2.7.14.ebuild,
+  slmodem-2.9.10-r1.ebuild:
+  Fixed ebuild when USE=-alsa. Thanks to Ryan Finnie
+  <gentoo-bugzilla@arrrrrr.com> in bug #68179. Removed old version
 
 *slmodem-2.9.10-r1 (16 Oct 2004)
 
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 20de68921c66..d7123cd8f29f 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -2,16 +2,11 @@
 Hash: SHA1
 
 MD5 7faf41f1aa59e6b8a1673f106ffac1e1 metadata.xml 523
-MD5 39a6e7fcda2ee23817e894ed009e7ba7 slmodem-2.7.14.ebuild 1511
-MD5 bfb004d2c959ab07d5cc9e1c924f2e20 ChangeLog 6327
+MD5 e31d9e58907ce4459cd9f117004f1b57 ChangeLog 6655
 MD5 d5d2b6c197ae9d40d4e3326e2f1b1dd5 slmodem-2.9.9-r2.ebuild 4335
 MD5 d087a4c2817309c5060154ad7840a463 slmodem-2.9.10.ebuild 4333
-MD5 b27063590a8a011c3588837dfa7d0c39 slmodem-2.9.10-r1.ebuild 3934
+MD5 9653472eb8c2bd13526f03eb9790502c slmodem-2.9.10-r1.ebuild 3931
 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 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10 66
 MD5 9ae4e594075f43c76a7067fa8004095a files/digest-slmodem-2.9.9-r2 65
@@ -23,7 +18,7 @@ MD5 a1b37267647bbb45a01facc3b807ccff files/slmodem-2.9.9-makefile-fixup.patch 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBcIWmmdTrptrqvGERAhBIAJ4woXIqjpsuYvGnh42IiTxOFh/sVgCbB3eE
-s4Ki8mmyansNm4D1ICiC2dI=
-=3Xkg
+iD8DBQFBfBcxmdTrptrqvGERAuKZAJ42jcsg9t4ajBWjLRL6EJ/mC9CgcgCfSLIz
+ls6J4Dwf5j8HoJ6VONkdjhE=
+=aWjn
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.7.14 b/net-dialup/slmodem/files/digest-slmodem-2.7.14
deleted file mode 100644
index 4c09b06c4c29..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.7.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2fb4e60d46a55c8e6445600b4ce4e921 slmdm-2.7.14.tar.gz 745352
diff --git a/net-dialup/slmodem/files/slmodem-2.7.14-makefile-fixup.patch b/net-dialup/slmodem/files/slmodem-2.7.14-makefile-fixup.patch
deleted file mode 100644
index 76a45594244a..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.7.14-makefile-fixup.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -urN slmdm-2.7.14-old/Makefile slmdm-2.7.14/Makefile
---- slmdm-2.7.14-old/Makefile	2003-10-28 21:03:26.000000000 -0500
-+++ slmdm-2.7.14/Makefile	2003-10-28 21:03:37.000000000 -0500
-@@ -15,7 +15,7 @@
- 
- 
- # Tools
--CC      := gcc
-+CC      := ${CC}
- LD      := ld
- INSTALL := install
- DEPMOD  := /sbin/depmod
-@@ -32,6 +32,7 @@
- -include debug.mk
- 
- # Definitions
-+prefix_dir = ${D}
- MODULES_DIR  = /lib/modules/$(shell ./kernel-ver)/misc
- MODEM_DEV   := ttySL0
- MODEM_LINK  := modem
-@@ -50,7 +51,7 @@
- 
- 
- # C FLAGS
--CFLAGS:= -Wall -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB $(INCLUDES) $(MODVERSIONS_FLAGS)
-+CFLAGS:= ${CFLAGS} -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB $(INCLUDES) $(MODVERSIONS_FLAGS)
- #CFLAGS:= -Wall -O3 -fomit-frame-pointer -DMODEM_DEBUG=$(DEBUG) -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB $(INCLUDES) $(MODVERSIONS_FLAGS)
- ifdef DEBUG
- CFLAGS += -DMODEM_DEBUG=$(DEBUG)
-@@ -101,10 +102,10 @@
- 	$(INSTALL) -D -m 644 slamrmo.o $(prefix_dir)/$(MODULES_DIR)/slamrmo.o
- 	$(INSTALL) -D -m 644 slusb.o $(prefix_dir)/$(MODULES_DIR)/slusb.o
- 	$(INSTALL) -D -m 755 country.dat $(prefix_dir)/etc/country.dat
--	$(INSTALL) -d $(prefix_dir)/dev
--	$(RM) -f $(prefix_dir)/dev/$(MODEM_DEV)
--	$(MKNOD) -m 666  $(prefix_dir)/dev/$(MODEM_DEV) c 212 0
--	$(LN) -sf ./$(MODEM_DEV)  $(prefix_dir)/dev/$(MODEM_LINK)
-+#	$(INSTALL) -d $(prefix_dir)/dev
-+#	$(RM) -f $(prefix_dir)/dev/$(MODEM_DEV)
-+#	$(MKNOD) -m 666  $(prefix_dir)/dev/$(MODEM_DEV) c 212 0
-+#	$(LN) -sf ./$(MODEM_DEV)  $(prefix_dir)/dev/$(MODEM_LINK)
- 
- uninstall: kernel-ver cleanup-config unload-modules
- 	$(RM) -f $(prefix_dir)/$(MODULES_DIR)/slmdm.o
diff --git a/net-dialup/slmodem/files/slmodem-2.7.devfs b/net-dialup/slmodem/files/slmodem-2.7.devfs
deleted file mode 100644
index fe39a0945bcb..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.7.devfs
+++ /dev/null
@@ -1,7 +0,0 @@
-# slmodem kernel modules' devfs configuration file
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.7.devfs,v 1.2 2004/07/18 03:51:28 dragonheart Exp $
-
-# Create /dev/modem for /dev/ttySL0 (Change to suit your setup)
-LOOKUP          ^modem$    CFUNCTION GLOBAL mksymlink ttySL0 modem
-REGISTER        ^ttySL0$   CFUNCTION GLOBAL mksymlink $devname modem
-UNREGISTER      ^ttySL0$   CFUNCTION GLOBAL unlink modem
diff --git a/net-dialup/slmodem/files/slmodem-2.7.modules b/net-dialup/slmodem/files/slmodem-2.7.modules
deleted file mode 100644
index 9e4b9168040e..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.7.modules
+++ /dev/null
@@ -1,21 +0,0 @@
-# slmodem 2.7.x kernel modules' configuration file
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.7.modules,v 1.3 2004/07/18 03:51:28 dragonheart Exp $
-
-## IMPORTANT:
-## You need to customise this for your modem
-## and then run the `modules-update' command.
-
-## Uncomment one of the two MODEM options.
-# define MODEM slamrmo
-# define MODEM slusb
-
-## Uncomment this and select your country.
-## 'slver -c' will give you a list.
-# options slmdm country=USA
-
-## You do not need to change anything below here.
-alias char-major-212 slmdm
-alias /dev/modem ${MODEM}
-alias slmdm off
-pre-install ${MODEM} modprobe slmdm
-probeall /dev/ttySL* slmdm ${MODEM}
diff --git a/net-dialup/slmodem/slmodem-2.7.14.ebuild b/net-dialup/slmodem/slmodem-2.7.14.ebuild
deleted file mode 100644
index a779ea2b287f..000000000000
--- a/net-dialup/slmodem/slmodem-2.7.14.ebuild
+++ /dev/null
@@ -1,66 +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.7.14.ebuild,v 1.7 2004/07/01 22:10:03 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://www.smlink.com/"
-MY_P="${P/modem/mdm}"
-SRC_URI="ftp://ftp.smlink.com/linux/unsupported/${MY_P}.tar.gz"
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-RDEPEND="virtual/libc"
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PF}-makefile-fixup.patch
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	make install || die
-
-	dodoc README COPYRIGHT FAQ Changes
-
-	# Executable to get regions and version
-	exeinto /usr/bin
-	doexe slver
-
-	# Install /etc/{devfs,modules}.d/slmodem files
-	insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.7.devfs ${PN}
-	insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.7.modules ${PN}
-}
-
-pkg_postinst() {
-	# Make some devices if we aren't using devfs
-	# If we are using devfs, restart it
-	if [ ! -e ${ROOT}dev/.devfsd ]
-	then
-		ebegin "Creating /dev/ttySL* devices"
-		local C="0"
-		while [ "${C}" -lt "4" ]
-		do
-			if [ ! -c ${ROOT}dev/ttySL${C} ]
-			then
-				mknod ${ROOT}dev/ttySL${C} c 212 0
-			fi
-			C="`expr $C + 1`"
-		done
-		eend 0
-	else
-		ebegin "Restarting devfsd to create /dev/modem symlink"
-			killall -HUP devfsd
-		eend 0
-	fi
-
-	echo
-	einfo "You must edit /etc/modules.d/${PN} and run"
-	einfo "modules-update to complete configuration."
-}
diff --git a/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild b/net-dialup/slmodem/slmodem-2.9.10-r1.ebuild
index a161bfc75493..26579171b391 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.1 2004/10/16 02:21:20 dragonheart Exp $
+# $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 $
 
 inherit kernel-mod eutils
 
@@ -29,7 +29,7 @@ src_compile() {
 	then
 		export SUPPORT_ALSA=1
 	else
-		export SUPPORT_ALSA=0
+		unset SUPPORT_ALSA
 	fi
 
 	# http://marc.theaimsgroup.com/?l=gentoo-dev&m=109672618708314&w=2