Version bump to 2.9.9 for hardware testing

8 files changed, 299 insertions, 456 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index 7c6f0b48c0de..70d4b0ce5905 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.14 2004/07/01 22:10:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.15 2004/07/24 16:31:51 dragonheart Exp $
+
+*slmodem-2.9.9 (25 Jul 2004)
+
+  25 Jul 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/slmodem-2.9.8-makefile-fixup.patch, -files/slmodem-2.9.8-udev.patch,
+  +files/slmodem-2.9.9-makefile-fixup.patch, -slmodem-2.9.8.ebuild,
+  +slmodem-2.9.9.ebuild:
+  removed broken version - 2.9.8. Version bump to 2.9.9 for hardware testing
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   slmodem-2.7.14.ebuild, slmodem-2.9.7-r1.ebuild, slmodem-2.9.7-r2.ebuild,
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 06b608dd53f4..92fbd4b9f7a9 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d916f57213f3d780ad23761ac8107b39 ChangeLog 2830
+MD5 206d1d1adc1054d84c9548d3aadaef96 ChangeLog 3163
 MD5 8114f79f8735648770d8f37c32861c88 metadata.xml 252
 MD5 39a6e7fcda2ee23817e894ed009e7ba7 slmodem-2.7.14.ebuild 1511
 MD5 aa56ae238239ffc06f6127c7ea73c731 slmodem-2.9.7.ebuild 2106
 MD5 372056f392f4fb7e5403ab11e34f08c9 slmodem-2.9.7-r1.ebuild 2766
 MD5 6fa12f24d063c8e27767d74d89b0045e slmodem-2.9.7-r2.ebuild 3361
-MD5 a1ad9454d479b818a835b0959acb8cea slmodem-2.9.8.ebuild 3678
+MD5 461d811428c9a834e11772926e42384c slmodem-2.9.9.ebuild 3799
 MD5 cda432a065dd7b5dfbc2b3f3d7821c67 files/slmodem-2.9.conf 421
 MD5 04150d1eddd9774a7d1a70df93600e3c files/digest-slmodem-2.7.14 64
 MD5 5565553c8ddd949c38070e59ce64b90c files/slmodem-2.7.14-makefile-fixup.patch 1626
@@ -20,13 +20,12 @@ MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
 MD5 6d23855e3c637f7b2e1799be2a9e462e files/slmodem-2.9.init 1284
 MD5 0391d6463fed235e6038d9048a7e5251 files/digest-slmodem-2.9.7-r1 65
 MD5 0391d6463fed235e6038d9048a7e5251 files/digest-slmodem-2.9.7-r2 65
-MD5 beeec963789173fb340cc4c44aab772b files/slmodem-2.9.8-makefile-fixup.patch 3684
-MD5 9d14d921bbf230c9f43c760754dc29d6 files/slmodem-2.9.8-udev.patch 7543
-MD5 0e7c5cfcfcd8e50a82223e6206eb4fcb files/digest-slmodem-2.9.8 65
+MD5 9ae4e594075f43c76a7067fa8004095a files/digest-slmodem-2.9.9 65
+MD5 25bc07758bde2e7a6aeb796e840d4ff2 files/slmodem-2.9.9-makefile-fixup.patch 6327
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFA+fWEmdTrptrqvGERArjbAKCRYNyejxkBmfhLL5NSy/Zj8KCErACfd+q4
-S+PxBq8DGSYYOD+pyf1Iy8w=
-=sPLc
+iD8DBQFBApDVmdTrptrqvGERAvNgAKCVkBrAgvGtUMJU040MxUI619B8DgCfRxUf
+AIKx9L+8SyHKnAgqVSKaHnU=
+=CzNB
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.8 b/net-dialup/slmodem/files/digest-slmodem-2.9.8
deleted file mode 100644
index cfd4c745e8f2..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ff4154b50e13cdb443896d71926a8c3 slmodem-2.9.8.tar.gz 708213
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9 b/net-dialup/slmodem/files/digest-slmodem-2.9.9
new file mode 100644
index 000000000000..099d04f8b31f
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.9
@@ -0,0 +1 @@
+MD5 b9eb4b43d8428024d9bb2fa3db4d56ea slmodem-2.9.9.tar.gz 708051
diff --git a/net-dialup/slmodem/files/slmodem-2.9.8-makefile-fixup.patch b/net-dialup/slmodem/files/slmodem-2.9.8-makefile-fixup.patch
deleted file mode 100644
index b8f78598971e..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.8-makefile-fixup.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -ru slmodem-2.9.8.orig/Makefile slmodem-2.9.8/Makefile
---- slmodem-2.9.8.orig/Makefile	2004-02-03 02:13:43.000000000 +0930
-+++ slmodem-2.9.8/Makefile	2004-06-20 14:53:10.478602760 +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
-+DESTDIR = ${D}
- 
- # tools
- INSTALL:=install
-@@ -25,6 +27,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 -ru slmodem-2.9.8.orig/drivers/Makefile slmodem-2.9.8/drivers/Makefile
---- slmodem-2.9.8.orig/drivers/Makefile	2003-12-22 06:45:54.000000000 +0930
-+++ slmodem-2.9.8/drivers/Makefile	2004-06-20 14:53:38.799297360 +0930
-@@ -15,8 +15,11 @@
- 
- #KBUILD_VERBOSE=1
- #export KBUILD_VERBOSE
-+DESTDIR = ${D}
- 
--KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
-+
-+KERNEL_VER:=$(shell uname -r)
-+KERNEL_DIR:=/lib/modules/$(KERNEL_VER)/build
- 
- EXTRA_CFLAGS = -I$(obj) -I$(obj)/../modem
- 
-@@ -28,18 +31,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 +63,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 +75,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 +105,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 -ru slmodem-2.9.8.orig/modem/Makefile slmodem-2.9.8/modem/Makefile
---- slmodem-2.9.8.orig/modem/Makefile	2003-11-20 22:20:47.000000000 +0930
-+++ slmodem-2.9.8/modem/Makefile	2004-06-20 14:51:29.458960080 +0930
-@@ -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.8-udev.patch b/net-dialup/slmodem/files/slmodem-2.9.8-udev.patch
deleted file mode 100644
index 6b7112a73487..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.8-udev.patch
+++ /dev/null
@@ -1,279 +0,0 @@
-Add sysfs support to slmodem drivers.
-- Daniel Drake <dsd@gentoo.org>
-
-diff -urNp slmodem-2.9.8/drivers/amrmo_init.c slmodem-dsd/drivers/amrmo_init.c
---- slmodem-2.9.8/drivers/amrmo_init.c	2004-04-22 16:55:35.000000000 +0100
-+++ slmodem-dsd/drivers/amrmo_init.c	2004-06-18 20:48:12.604672976 +0100
-@@ -54,6 +54,7 @@
- #include <linux/fs.h>
- #include <asm/uaccess.h>
- #include <linux/devfs_fs_kernel.h>
-+#include <linux/device.h>
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- #define OLD_KERNEL 1
-@@ -270,7 +271,7 @@ MODULE_DEVICE_TABLE (pci, amrmo_pci_tbl)
- 
- 
- static struct amrmo_struct *amrmo_table[MAXNUM] = {};
--
-+static struct class_simple *amrmo_class;
- 
- /*
-  *    debug stuff
-@@ -613,6 +614,7 @@ static int __init amrmo_pci_probe(struct
- 	}
- #endif
- #else
-+	class_simple_device_add(amrmo_class, MKDEV(AMRMO_MAJOR, i), NULL, "slamr%d", i);
- 	devfs_mk_cdev(MKDEV(AMRMO_MAJOR,i), S_IFCHR|S_IRUSR|S_IWUSR, "slamr%d", i);
- #endif
- 	return 0;
-@@ -644,6 +646,7 @@ static void __exit amrmo_pci_remove(stru
- 	}
- #endif
- #else
-+	class_simple_device_remove(MKDEV(AMRMO_MAJOR, amrmo->num));
- 	devfs_remove("slamr%d", amrmo->num);
- #endif
- 	amrmo_table[amrmo->num] = NULL;
-@@ -720,23 +723,39 @@ static int __init amrmo_init(void)
- 			}
- #endif
- 		}
-+   }
-+
-+	/* must create class_simple before the bus gets probed */
-+#ifndef OLD_KERNEL
-+	amrmo_class = class_simple_create(THIS_MODULE, "slamr");
-+	if (IS_ERR(amrmo_class)) {
-+		int err = PTR_ERR(amrmo_class);
-+		printk(KERN_INFO "slamr: failure creating simple class, error %d\n", err);
-+		return err;
- 	}
-+#endif
- 
- 	if (!pci_register_driver(&amrmo_pci_driver)) {
- 		pci_unregister_driver(&amrmo_pci_driver);
--                return -ENODEV;
-+		class_simple_destroy(amrmo_class);
-+		return -ENODEV;
- 	}
- 
- 	if(register_chrdev(AMRMO_MAJOR, "slamr", &amrmo_fops) < 0) {
- 		pci_unregister_driver(&amrmo_pci_driver);
-+		class_simple_destroy(amrmo_class);
- 		return -ENOMEM;
- 	}
-+
- 	return 0;
- }
- 
- static void __exit amrmo_exit(void)
- {
- 	AMRMO_DBG("slamr: exit...\n");
-+#ifndef OLD_KERNEL
-+	class_simple_destroy(amrmo_class);
-+#endif
- 	unregister_chrdev(AMRMO_MAJOR,"slamr");
- 	pci_unregister_driver(&amrmo_pci_driver);
- }
-diff -urNp slmodem-2.9.8/drivers/old_st7554.c slmodem-dsd/drivers/old_st7554.c
---- slmodem-2.9.8/drivers/old_st7554.c	2004-06-14 15:19:26.000000000 +0100
-+++ slmodem-dsd/drivers/old_st7554.c	2004-06-18 20:47:02.738294280 +0100
-@@ -55,6 +55,7 @@
- #include <linux/poll.h>
- #include <linux/usb.h>
- #include <linux/devfs_fs_kernel.h>
-+#include <linux/device.h>
- 
- #include <modem_defs.h>
- 
-@@ -73,6 +74,10 @@
- 
- #define MY_MAJOR 213
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-+#define OLD_KERNEL 1
-+#endif
-+
- static int debug = 0;
- MODULE_PARM(debug,"i");
- MODULE_PARM_DESC(debug,"Debug level: 0-3 (default=0)");
-@@ -201,6 +206,7 @@ struct st7554_state {
- 
- 
- static struct st7554_state *st7554_table[MAX_MODEMS];
-+static struct class_simple *st7554_class;
- 
- static DECLARE_MUTEX(open_sem);
- 
-@@ -1299,6 +1305,10 @@ static void *st7554_probe(struct usb_dev
- 		mo_free(s); mi_free(s);
- 		goto error1;
- 	}
-+
-+#ifndef OLD_KERNEL
-+	class_simple_device_add(st7554_class, MKDEV(MY_MAJOR, s->minor), NULL, "slusb%d", i);
-+#endif
- #ifdef CONFIG_DEVFS_FS
- 	{
- 		char buf[8];
-@@ -1333,6 +1343,10 @@ static void st7554_disconnect(struct usb
- 		s->file->private_data = NULL;
- 		s->file = NULL;
- 	}
-+
-+#ifndef OLD_KERNEL
-+	class_simple_device_remove(MKDEV(MY_MAJOR, s->minor));
-+#endif
- #ifdef CONFIG_DEVFS_FS
- 	{
- 		char buf[8];
-@@ -1343,6 +1357,7 @@ static void st7554_disconnect(struct usb
- 		devfs_unregister (handle);
- 	}
- #endif
-+
- 	st7554_stop(s);
- 	st7554_release(s);
- 	s->usbdev = NULL;
-@@ -1362,15 +1377,29 @@ static int __init st7554_modem_init(void
- {
- 	int ret;
- 	USB_INFO ("ST7554 USB Modem.\n");
-+
-+	/* must create class_simple before the bus gets probed */
-+#ifndef OLD_KERNEL
-+	st7554_class = class_simple_create(THIS_MODULE, "slusb");
-+	if (IS_ERR(st7554_class)) {
-+		ret = PTR_ERR(st7554_class);
-+		USB_ERR("st7554_modem_init: failed to create sysfs class, error %d\n", ret);
-+		return PTR_ERR(st7554_class);
-+	}
-+#endif
-+
- 	ret = usb_register(&st7554_usb_driver);
- 	if ( ret ) {
- 		USB_ERR ("st7554_modem_init: cannot register usb device.\n");
-+		class_simple_destroy(st7554_class);
- 		return ret;
- 	}
- 	if(register_chrdev(MY_MAJOR, "slusb", &st7554_fops) < 0) {
-+		class_simple_destroy(st7554_class);
- 		usb_deregister(&st7554_usb_driver);
- 		return -ENOMEM;
- 	}
-+
- 	return 0;
- }
- 
-@@ -1378,6 +1407,9 @@ static int __init st7554_modem_init(void
- static void __exit st7554_modem_exit(void)
- {
- 	USB_DBG ("st7554: exit...\n");
-+#ifndef OLD_KERNEL
-+	class_simple_destroy(st7554_class);
-+#endif
- 	unregister_chrdev(MY_MAJOR,"slusb");
- 	usb_deregister(&st7554_usb_driver);
- }
-diff -urNp slmodem-2.9.8/drivers/st7554.c slmodem-dsd/drivers/st7554.c
---- slmodem-2.9.8/drivers/st7554.c	2004-06-01 19:28:00.000000000 +0100
-+++ slmodem-dsd/drivers/st7554.c	2004-06-18 20:46:41.255560152 +0100
-@@ -55,6 +55,7 @@
- #include <linux/poll.h>
- #include <linux/usb.h>
- #include <linux/devfs_fs_kernel.h>
-+#include <linux/device.h>
- 
- #include <modem_defs.h>
- 
-@@ -67,6 +68,10 @@
- #define DEBUG_URB_PRINT 0
- #define USB_DBG_URB(fmt...) // USB_DBG(fmt)
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-+#define OLD_KERNEL 1
-+#endif
-+
- static int debug = 0;
- MODULE_PARM(debug,"i");
- MODULE_PARM_DESC(debug,"Debug level: 0-3 (default=0)");
-@@ -205,6 +210,7 @@ struct st7554_state {
- 
- 
- static struct st7554_state *st7554_table[MAX_MODEMS] = {};
-+static struct class_simple *st7554_class;
- 
- static DECLARE_MUTEX(open_sem);
- 
-@@ -1275,6 +1281,9 @@ static int st7554_probe(struct usb_inter
- 	}
- 
- 	usb_set_intfdata(interface, s );
-+#ifndef OLD_KERNEL
-+	class_simple_device_add(st7554_class, MKDEV(213, i), NULL, "slusb%d", i);
-+#endif
- 	devfs_mk_cdev(MKDEV(213,i),S_IFCHR|S_IRUSR|S_IWUSR,"slusb%d",i);
- 
- 	USB_INFO(KERN_INFO "slusb: slusb%d is found.\n", s->minor);
-@@ -1298,11 +1307,14 @@ static void st7554_disconnect(struct usb
- 	struct st7554_state *s = usb_get_intfdata(interface);
- 	usb_set_intfdata(interface, NULL );
- 	USB_DBG("st7554 disconnect...\n");
--        if (!s || !s->usbdev) {
--                USB_DBG("st7554 disconnect: no dev.\n");
--                return;
--        }
-+	if (!s || !s->usbdev) {
-+		USB_DBG("st7554 disconnect: no dev.\n");
-+		return;
-+	}
- 
-+#ifndef OLD_KERNEL
-+	class_simple_device_remove(MKDEV(213, s->minor));
-+#endif
-  	devfs_remove("slusb%d",s->minor);
- 
- 	st7554_stop(s);
-@@ -1335,15 +1347,29 @@ static int __init st7554_modem_init(void
- {
- 	int ret;
- 	USB_INFO ("ST7554 USB Modem.\n");
-+
-+	/* must create class_simple before the bus gets probed */
-+#ifndef OLD_KERNEL
-+	st7554_class = class_simple_create(THIS_MODULE, "slusb");
-+	if (IS_ERR(st7554_class)) {
-+		ret = PTR_ERR(st7554_class);
-+		USB_ERR("st7554_modem_init: failed to create sysfs class, error %d\n", ret);
-+		return ret;
-+	}
-+#endif
-+
- 	ret = usb_register(&st7554_usb_driver);
- 	if ( ret ) {
- 		USB_ERR ("st7554_modem_init: cannot register usb device.\n");
-+		class_simple_destroy(st7554_class);
- 		return ret;
- 	}
- 	if(register_chrdev(213, "slusb", &st7554_fops) < 0) {
- 		usb_deregister(&st7554_usb_driver);
-+		class_simple_destroy(st7554_class);
- 		return -ENOMEM;
- 	}
-+
- 	return 0;
- }
- 
-@@ -1351,6 +1377,9 @@ static int __init st7554_modem_init(void
- static void __exit st7554_modem_exit(void)
- {
- 	USB_DBG ("st7554: exit...\n");
-+#ifndef OLD_KERNEL
-+	class_simple_destroy(st7554_class);
-+#endif
- 	unregister_chrdev(213,"slusb");
- 	usb_deregister(&st7554_usb_driver);
- }
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
new file mode 100644
index 000000000000..ca92824f9d82
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.9-makefile-fixup.patch
@@ -0,0 +1,213 @@
+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/slmodem-2.9.8.ebuild b/net-dialup/slmodem/slmodem-2.9.9.ebuild
index 69196f5ca9e6..822cd956e314 100644
--- a/net-dialup/slmodem/slmodem-2.9.8.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.9.ebuild
@@ -1,68 +1,78 @@
 # 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.8.ebuild,v 1.4 2004/07/14 23:10:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9.ebuild,v 1.1 2004/07/24 16:31:51 dragonheart Exp $
 
 inherit kmod eutils
 
 DESCRIPTION="Driver for Smart Link modem"
 HOMEPAGE="http://www.smlink.com/"
-SRC_URI="ftp://ftp.smlink.com/linux/unsupported/${P}.tar.gz"
+SRC_URI="http://www.smlink.com/main/down/${P}.tar.gz"
 LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="-*"
+SLOT="${KV}"
+KEYWORDS="~x86"
 IUSE="alsa"
 
 DEPEND="virtual/libc
 	alsa? ( media-libs/alsa-lib )
-	sys-kernel/config-kernel"
+	sys-kernel/linux-headers"
 
-RDEPEND="${DEPEND}"
+#	sys-kernel/config-kernel
 
-KMOD_SOURCES="${P}.tar.gz"
+RDEPEND="virtual/libc
+	alsa? ( media-libs/alsa-lib )"
+
+#KMOD_SOURCES="${P}.tar.gz"
+#KMOD_KOUTPUT_PATCH=""
 
 src_unpack() {
+	# Unpack and set some variables
 	kmod_src_unpack
+
 	cd ${S}
 	epatch ${FILESDIR}/${P}-makefile-fixup.patch
-	epatch ${FILESDIR}/${P}-udev.patch
 }
 
 src_compile() {
 
-	[ -d /lib/modules/${KERNEL_VER/linux-/}/build ] || die "Build kernel ${KERNEL_VER} first"
+	#[ -d ${KV_OUTPUT} ] || die "Build kernel ${KV_VERSION_FULL} first"
 
-	unset ARCH
+	export KERNEL_OUTPUT_DIR=${S}/workdir
 
+	if is_kernel 2 5 || is_kernel 2 6
+	then
+		unset ARCH
+	fi
 
-	mkdir ${S}/workdir
-
-	emake MODVERDIR=${T}/.tmp_versions O=${S}/workdir \
-		KERNEL_VER=${KERNEL_VER/linux-/} \
-		drivers || die "Failed to compile driver"
-
-	cd modem;
-	if use alsa;
+	if use alsa
 	then
-		emake SUPPORT_ALSA=1 MODVERDIR=${T}/.tmp_versions O=${S}/workdir \
-			KERNEL_VER=${KERNEL_VER/linux-/} \
-			|| die 'Alsa support failed, try USE="-alsa"'
+		export SUPPORT_ALSA=1
 	else
-		emake MODVERDIR=${T}/.tmp_versions O=${S}/workdir \
-			KERNEL_VER=${KERNEL_VER/linux-/} \
-			 || die "Could not compile"
+		export SUPPORT_ALSA=0
 	fi
-}
 
-src_test() {
-	cd modem
-	emake modem_test
-	./modem_test || die "failed modem test"
+	mkdir ${S}/workdir
+	#cd ${S}/workdir
+	#cp ${KV_OUTPUT}/.config .
+
+	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"
+#}
+
 src_install() {
 	unset ARCH
-	emake DESTDIR=${D} KERNEL_VER=${KERNEL_VER/linux-/} install-drivers \
+	emake DESTDIR=${D} \
+		KERNEL_VER=${KV_VERSION_FULL} \
+		install-drivers \
 		|| die "driver install failed"
 
 	dosbin modem/slmodemd
@@ -91,32 +101,37 @@ src_install() {
 		echo 'slamr*:root:dialout:0660' > \
 			${D}/etc/udev/permissions.d/55-${PN}.permissions
 	else
-	# simple raw devs
-		dodir /dev
-		cd ${D}/dev
-		ebegin "Creating /dev/slamr* devices"
-		local C="0"
-		while [ "${C}" -lt "4" ]
-		do
-			if [ ! -c ${ROOT}/dev/slamr${C} ]
-			then
-				mknod ${D}/dev/slamr${C} c 212 ${C}
-			#	doco suggests that the slmodemd creates these
-			#	ln -s slamr${C} ttySL${C}
-			fi
-			if [ ! -c ${ROOT}/dev/slamr${C} ]
-			then
-				mknod ${D}/dev/slusb${C} c 213 ${C}
-			#TODO usb or slamr (AMR/CNR/PCI) version for symlinks???
-			#	ln -s sl${C} ttySL${C}
-			fi
-
-			C="`expr $C + 1`"
-		done
-		eend 0
-		ln -s ttySL0 modem
+		make -C drivers DESTDIR=${D} KERNELRELEASE=1 KERNEL_VER=${KV_VERSION_FULL} install-devices
 	fi
 
+	#if 1
+	#then
+	# simple raw devs
+	#	dodir /dev
+	#	ebegin "Creating /dev/slamr* devices"
+	#	local C="0"
+	#	while [ "${C}" -lt "4" ]
+	#	do
+	#		if [ ! -c ${ROOT}/dev/slamr${C} ]
+	#		then
+	#			mknod ${D}/dev/slamr${C} c 212 ${C}
+	#		#	doco suggests that the slmodemd creates these
+	#		#	ln -s slamr${C} ttySL${C}
+	#		fi
+	#		if [ ! -c ${ROOT}/dev/slamr${C} ]
+	#		then
+	#			mknod ${D}/dev/slusb${C} c 213 ${C}
+	#		#TODO usb or slamr (AMR/CNR/PCI) version for symlinks???
+	#		#	ln -s sl${C} ttySL${C}
+	#		fi
+
+	#		C="`expr $C + 1`"
+	#	done
+	#	eend 0
+	#	cd ${D}/dev
+	#	ln -s ttySL0 modem
+	#fi
+
 }
 
 pkg_postinst() {