Added version bump (bug #47947)

9 files changed, 279 insertions, 2 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 357276f03e34..85ad36958a1a 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.6 2004/04/27 21:43:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.7 2004/05/23 07:16:49 dragonheart Exp $
+
+*slmodem-2.9.7 (23 May 2004)
+
+  23 May 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/slmodem-2.9.7-makefile-fixup.patch, +files/slmodem-2.9.conf,
+  +files/slmodem-2.9.devfs, +files/slmodem-2.9.init,
+  +files/slmodem-2.9.modules, +slmodem-2.9.7.ebuild:
+  Added version bump (bug #47947). Thanks to Simon Cooper <thecoop@runbox.com>
+  and Mark Wagner <mark+gentoo@lanfear.net>
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> slmodem-2.7.14.ebuild:
   Add inherit eutils
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 50240cb4b467..a9a8c0bcb6c9 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,7 +1,14 @@
+MD5 763f12ea2edb14d6a2dfb0e0f888d10f ChangeLog 1400
 MD5 8114f79f8735648770d8f37c32861c88 metadata.xml 252
 MD5 226b1bc187c6609edaf3609999d74a39 slmodem-2.7.14.ebuild 1519
-MD5 6768037867b86f2d5ce19d106801596a ChangeLog 1014
+MD5 299edb6faf24d9122a8c40fa2225c4f9 slmodem-2.9.7.ebuild 2101
+MD5 cdd5b501b12add380d893257f3de3463 files/slmodem-2.9.conf 189
 MD5 04150d1eddd9774a7d1a70df93600e3c files/digest-slmodem-2.7.14 64
 MD5 5565553c8ddd949c38070e59ce64b90c files/slmodem-2.7.14-makefile-fixup.patch 1626
 MD5 df926a828ac12650f7a841e67a7f1ee4 files/slmodem-2.7.devfs 430
 MD5 151e4ab854bcb09dc6af750b37d7dd9f files/slmodem-2.7.modules 665
+MD5 a54dee7b936a379da5ac8f02068260db files/slmodem-2.9.modules 761
+MD5 31efdce45dc6665bfc2c6cb50048d714 files/slmodem-2.9.7-makefile-fixup.patch 3476
+MD5 0391d6463fed235e6038d9048a7e5251 files/digest-slmodem-2.9.7 65
+MD5 5e9eca1bb7f00fe44cbca074912db65f files/slmodem-2.9.devfs 432
+MD5 bc700a480ba8dddac22a5f85e1ed75c2 files/slmodem-2.9.init 815
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.7 b/net-dialup/slmodem/files/digest-slmodem-2.9.7
new file mode 100644
index 000000000000..45a1ca010886
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.7
@@ -0,0 +1 @@
+MD5 741aec69a9cdb95fbce21105b4f1924c slmodem-2.9.7.tar.gz 648986
diff --git a/net-dialup/slmodem/files/slmodem-2.9.7-makefile-fixup.patch b/net-dialup/slmodem/files/slmodem-2.9.7-makefile-fixup.patch
new file mode 100644
index 000000000000..096f2d00995f
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.7-makefile-fixup.patch
@@ -0,0 +1,105 @@
+diff -urN slmodem-2.9.7.old/Makefile slmodem-2.9.7/Makefile
+--- slmodem-2.9.7.old/Makefile	2004-02-02 08:43:43.000000000 -0800
++++ slmodem-2.9.7/Makefile	2004-04-21 00:51:55.562017735 -0700
+@@ -14,6 +14,7 @@
+ ###########################################################################
+ 
+ KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
++DESTDIR = ${D}
+ 
+ # tools
+ INSTALL:=install
+@@ -25,6 +26,7 @@
+ 
+ install: all install-drivers
+ 	$(INSTALL) -D -m 755 modem/slmodemd ${DESTDIR}/usr/sbin/slmodemd
++	$(INSTALL) -D -m 755 modem/modem_test ${DESTDIR}/usr/sbin/modem_test
+ 	$(RM) -rf ${DESTDIR}/var/lib/slmodem
+ 	$(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem
+ 
+diff -urN slmodem-2.9.7.old/drivers/Makefile slmodem-2.9.7/drivers/Makefile
+--- slmodem-2.9.7.old/drivers/Makefile	2003-12-21 13:15:54.000000000 -0800
++++ slmodem-2.9.7/drivers/Makefile	2004-04-21 01:00:30.789187581 -0700
+@@ -15,6 +15,7 @@
+ 
+ #KBUILD_VERBOSE=1
+ #export KBUILD_VERBOSE
++DESTDIR = ${D}
+ 
+ KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
+ 
+@@ -28,18 +29,18 @@
+ ifndef KERNELRELEASE
+ ifndef KERNEL_VER
+ 
+-all install uninstall: kernel-ver
+-	$(MAKE) $@ KERNEL_VER=$(shell ./kernel-ver)
++all install uninstall:
++	$(MAKE) $@ KERNEL_VER=$(shell uname -r)
+ 
+-install: install-devices
+-uninstall: remove-devices
++#install: install-devices
++#uninstall: remove-devices
+ 
+-kernel-ver::
+-	$(CC) -I$(KERNEL_DIR)/include -o $@ $@.c
++#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 *~
++	$(RM) $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~
+ 
+ install-devices:
+ 	mkdir -p ${DESTDIR}/dev
+@@ -60,7 +61,7 @@
+ 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
++CFLAGS:= ${CFLAGS} -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include
+ 
+ all: $(obj-m)
+ 
+@@ -72,10 +73,10 @@
+ install: 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
++#	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 && \
+@@ -102,7 +103,7 @@
+ 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
+diff -urN slmodem-2.9.7.old/modem/Makefile slmodem-2.9.7/modem/Makefile
+--- slmodem-2.9.7.old/modem/Makefile	2003-11-20 04:50:47.000000000 -0800
++++ slmodem-2.9.7/modem/Makefile	2004-04-21 00:45:34.215271352 -0700
+@@ -13,10 +13,10 @@
+ #
+ ###########################################################################
+ 
+-CC:= gcc
++CC:= ${CC}
+ RM:= rm -f
+ 
+-CFLAGS:= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM
++CFLAGS:= ${CFLAGS} -I. -DCONFIG_DEBUG_MODEM
+ 
+ 
+ modem-objs:= \
diff --git a/net-dialup/slmodem/files/slmodem-2.9.conf b/net-dialup/slmodem/files/slmodem-2.9.conf
new file mode 100644
index 000000000000..4738d715e4c9
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.conf
@@ -0,0 +1,13 @@
+# Config file for /etc/init.d/slmodemd
+
+MODULE=slamr
+#DEV=/dev/ttySL0
+#LN_DEV=/dev/modem
+#MODEM_DAEMON=/usr/sbin/slmodemd
+
+COUNTRY=USA
+
+# NEEDED: PTSN defaults
+#COUNTRY=USA
+#COUNTRY=ITALY
+
diff --git a/net-dialup/slmodem/files/slmodem-2.9.devfs b/net-dialup/slmodem/files/slmodem-2.9.devfs
new file mode 100644
index 000000000000..4e0768bd96ab
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.devfs
@@ -0,0 +1,7 @@
+# slmodem kernel modules' devfs configuration file
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.devfs,v 1.1 2004/05/23 07:16:49 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.9.init b/net-dialup/slmodem/files/slmodem-2.9.init
new file mode 100644
index 000000000000..d95793581780
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.init
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/05/23 07:16:49 dragonheart Exp $
+
+depend() {
+    need logger
+}
+
+
+checkconfig() {
+	if [ -z "${COUNTRY}" ]; then
+		eerror "You need to config /etc/conf.d/slmodem first"
+		return 1
+	fi
+}
+
+start() {
+	ebegin "Starting slmodemd"
+	modprobe ${MODULE}
+	start-stop-daemon --start --quiet --background --make-pidfile \
+		--pidfile /var/run/slmodemd.pid --startas /usr/sbin/slmodemd \
+		-- --country=${COUNTRY} /dev/${MODEM}0
+	eend $?
+}
+
+stop() {
+    ebegin "Shutting down slmodemd"
+    start-stop-daemon --stop --quiet --pidfile /var/run/slmodemd.pid && rm /var/run/slmodemd.pid
+    eend $?
+}
+
diff --git a/net-dialup/slmodem/files/slmodem-2.9.modules b/net-dialup/slmodem/files/slmodem-2.9.modules
new file mode 100644
index 000000000000..be4b5875b8d3
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.modules
@@ -0,0 +1,22 @@
+# slmodem 2.7.x kernel modules' configuration file
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.modules,v 1.1 2004/05/23 07:16:49 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 `grep MODEM= /etc/conf.d/slmodem | sed 's/MODEM=//'`
+
+## Uncomment this and select your country.
+define COUNTRY `grep country= /etc/conf.d/slmodem | sed 's/COUNTRY=//'`
+
+## You do not need to change anything below here.
+options slmdm country=${COUNTRY}
+alias char-major-212 slmdm
+alias char-major-213 slusb
+
+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.9.7.ebuild b/net-dialup/slmodem/slmodem-2.9.7.ebuild
new file mode 100644
index 000000000000..e40fa8f23027
--- /dev/null
+++ b/net-dialup/slmodem/slmodem-2.9.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.7.ebuild,v 1.1 2004/05/23 07:16:49 dragonheart Exp $
+
+DESCRIPTION="Driver for Smart Link modem"
+HOMEPAGE="http://www.smlink.com/"
+MY_P="${P}"
+SRC_URI="ftp://ftp.smlink.com/linux/unsupported/${MY_P}.tar.gz"
+LICENSE="Smart-Link"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="alsa"
+RDEPEND="virtual/glibc"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PF}-makefile-fixup.patch
+}
+
+src_compile() {
+	if has sandbox ${FEATURES} || has userpriv $FEATURES; then
+		ewarn "Users emerging this with a 2.6 kernel still need to disable"
+		ewarn "sandbox and userpriv from FEATURES."
+		die "bad FEATURES"
+	fi
+	unset ARCH
+	if use alsa
+	then
+		emake SUPPORT_ALSA=1 MODVERDIR=${T}/.tmp_versions || die 'Alsa support failed, try USE="-alsa"'
+	else
+		emake || die "Could not compile"
+	fi
+}
+
+src_install() {
+	unset ARCH
+	emake DESTDIR=${D} install || die
+
+	dodoc COPYING Changes README README.1st
+
+	# Install /etc/{devfs,modules,init,conf}.d/slmodem files
+	insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
+	insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.modules ${PN}
+	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
+	insopts -m0755; insinto /etc/init.d/; newins ${FILESDIR}/${PN}-2.9.init ${PN}
+
+	# Make some devices if we aren't using devfs
+	# If we are using devfs, restart it
+	if [ ! -e ${ROOT}/dev/.devfsd ]
+	then
+		dodir /dev
+		ebegin "Creating /dev/ttySL* devices"
+		local C="0"
+		while [ "${C}" -lt "4" ]
+		do
+			if [ ! -c ${ROOT}/dev/ttySL${C} ]
+			then
+				mknod ${D}/dev/ttySL${C} c 212 0
+			fi
+			C="`expr $C + 1`"
+		done
+		eend 0
+	fi
+
+}
+
+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 "Restarting devfsd to create /dev/modem symlink"
+			killall -HUP devfsd
+		eend 0
+	fi
+
+	echo
+	einfo "You must edit /etc/conf.d/${PN} and run"
+	einfo "modules-update to complete configuration."
+}