remove old

(Portage version: 2.1_pre9-r5)
 (Signed Manifest commit)

9 files changed, 38 insertions, 505 deletions

diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 4e7cdd83d6a4..dd63b95bd5a0 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,28 +1,51 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 28de5bcbae20ba6cda2fe88d5b8678a0 ChangeLog 13852
-MD5 66a7f4e6682670216c1497606c9c600b files/digest-slmodem-2.9.11_pre20051101 140
-MD5 fd55ef399408a109742263cd5b4a5219 files/digest-slmodem-2.9.9d 66
+AUX slmodem-2.9.11-modem-makefile.patch 676 RMD160 d561ccbf5d7c97dbf92fff89cc4f3a81afb6f2a3 SHA1 113d57aa16a454674302efe4daf32116f9d01638 SHA256 e6d59c4c08c6e9f9e8b78f65f2035f3372d9074d544a14b5b073cf7f1e3134db size 676
 MD5 5917f2af62708f83a73fd288c21a5e3d files/slmodem-2.9.11-modem-makefile.patch 676
+RMD160 d561ccbf5d7c97dbf92fff89cc4f3a81afb6f2a3 files/slmodem-2.9.11-modem-makefile.patch 676
+SHA256 e6d59c4c08c6e9f9e8b78f65f2035f3372d9074d544a14b5b073cf7f1e3134db files/slmodem-2.9.11-modem-makefile.patch 676
+AUX slmodem-2.9.11.init 2182 RMD160 bbacb69c48be43feff80eb0e6936ab293d9f66d9 SHA1 53ebf95ee488553bef54df4e823934b803f8fe01 SHA256 af9974afbcede01304f2367e9163a59db2ecca0e0fca7406e72f402968829e51 size 2182
 MD5 67168d0e7a1be3e5041ec3cb8dabb50d files/slmodem-2.9.11.init 2182
+RMD160 bbacb69c48be43feff80eb0e6936ab293d9f66d9 files/slmodem-2.9.11.init 2182
+SHA256 af9974afbcede01304f2367e9163a59db2ecca0e0fca7406e72f402968829e51 files/slmodem-2.9.11.init 2182
+AUX slmodem-2.9.11.modules 106 RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e SHA1 933fbb37e99e26b838d508c177cf69097903c36b SHA256 0ae1432fbae6e517190a841a6ae09806f24c16614e845d2e814a568285d96a7f size 106
 MD5 e91d1df68be76c531a8514dba77c1886 files/slmodem-2.9.11.modules 106
-MD5 fd0f0a405fb7f059cc2f5078d54fd884 files/slmodem-2.9.9b-gcc4.patch 463
+RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e files/slmodem-2.9.11.modules 106
+SHA256 0ae1432fbae6e517190a841a6ae09806f24c16614e845d2e814a568285d96a7f files/slmodem-2.9.11.modules 106
+AUX slmodem-2.9.conf 649 RMD160 7d3f89e8ad1831e0730924e421ab643368406c7c SHA1 627d9c8afb37275b0e147868f57bff2c25ebd0df SHA256 0f6cf3b88900d0b2717c7df33debd5247c46849fc3d92bc54cf84d4eb0b46bff size 649
 MD5 1a0b854bbe34e01e918b855b7c81ffba files/slmodem-2.9.conf 649
+RMD160 7d3f89e8ad1831e0730924e421ab643368406c7c files/slmodem-2.9.conf 649
+SHA256 0f6cf3b88900d0b2717c7df33debd5247c46849fc3d92bc54cf84d4eb0b46bff files/slmodem-2.9.conf 649
+AUX slmodem-2.9.devfs 786 RMD160 bc7d4385206864b16cd315d14ea60ef99533618d SHA1 5f457c7f76b1981032ca99049afdf181ae6b352f SHA256 4349b9ffa2c5b9adf43722c7b71dbf33f3ffce767a4ddbc630397ee23599ffa6 size 786
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
-MD5 3d00e935ef9592cf6538298cacd92a02 files/slmodem-2.9.init 2702
-MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
-MD5 1561aebe43beb20809e47ea1dd62115f files/slmodem-amd64-Makefile.diff 762
-MD5 618a9ebd35ccb49bf34e6ea522afcb8b files/slmodem-class-simple-to-class.diff 6847
-MD5 9c47e598fd639d46a03493fe7a52595e files/slmodem-remove-URB_ASYNC_UNLINK.patch 436
+RMD160 bc7d4385206864b16cd315d14ea60ef99533618d files/slmodem-2.9.devfs 786
+SHA256 4349b9ffa2c5b9adf43722c7b71dbf33f3ffce767a4ddbc630397ee23599ffa6 files/slmodem-2.9.devfs 786
+AUX slusb.hotplug 262 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 SHA1 79d922f24852a17385ff4ac82f586ca0ad477f3f SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed size 262
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 files/slusb.hotplug 262
+SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed files/slusb.hotplug 262
+DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172 size 833644
+DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 size 1872
+EBUILD slmodem-2.9.11_pre20051101.ebuild 4552 RMD160 bdf8245a6a40f89d9badc040dfd50717b78e51aa SHA1 720bfcd6d35127e5f34ad865bbdff5d8f13dc4dd SHA256 04eb7084a09b8127387260d980a12e65bbc934ef0164ce1b3e7debe8bf794ffd size 4552
 MD5 d6960faceb3ff583377e5203da151e6c slmodem-2.9.11_pre20051101.ebuild 4552
-MD5 da3f5db025a3799ee1bdf5b9eef53601 slmodem-2.9.9d.ebuild 3553
+RMD160 bdf8245a6a40f89d9badc040dfd50717b78e51aa slmodem-2.9.11_pre20051101.ebuild 4552
+SHA256 04eb7084a09b8127387260d980a12e65bbc934ef0164ce1b3e7debe8bf794ffd slmodem-2.9.11_pre20051101.ebuild 4552
+MISC ChangeLog 14166 RMD160 07677d1c9b255a5646853bd3faab58066c98ae85 SHA1 56f849943a34dbfd330c83dbc48f8a902a97be1d SHA256 b2ada5c587c96c3d0f2017001175e0bc8a28b3e166f6d4631032a777c8a58598 size 14166
+MD5 3e03f3842cc693193968a7d980c5671d ChangeLog 14166
+RMD160 07677d1c9b255a5646853bd3faab58066c98ae85 ChangeLog 14166
+SHA256 b2ada5c587c96c3d0f2017001175e0bc8a28b3e166f6d4631032a777c8a58598 ChangeLog 14166
+MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 size 163
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
+SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata.xml 163
+MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101 512
+RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101 512
+SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101 512
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFET5xKjG8pv1lIUX4RAuHJAJ9WxOCoyFpzwZZ9iorX3frwHGh1iwCeK8jJ
-O+4XTapTUwUKlVbUom+d/k4=
-=TS8u
+iD8DBQFEU6WYNJowsmZ/PzARAu2RAKDLk3tTBFP75Wlgu0YkPRTA+UOPIACfV+m7
+uONzGnYCViaPsHzljCM1H5s=
+=DhTY
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9d b/net-dialup/slmodem/files/digest-slmodem-2.9.9d
deleted file mode 100644
index d87ca9ff7c38..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.9d
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed8356258cad4979956b3617d3f0f44a slmodem-2.9.9d.tar.gz 709474
diff --git a/net-dialup/slmodem/files/slmodem-2.9.9b-gcc4.patch b/net-dialup/slmodem/files/slmodem-2.9.9b-gcc4.patch
deleted file mode 100644
index b7fcea20eaf5..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.9b-gcc4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur slmodem-2.9.9b.old/modem/modem.c slmodem-2.9.9b/modem/modem.c
---- slmodem-2.9.9b.old/modem/modem.c	2004-06-29 21:13:07.000000000 +0800
-+++ slmodem-2.9.9b/modem/modem.c	2005-04-30 14:16:57.000000000 +0800
-@@ -1599,9 +1599,9 @@
- }
- 
- 
-+static int sregs_init(unsigned char sregs[]);
- int modem_reset(struct modem *m)
- {
--	static int sregs_init(unsigned char sregs[]);
- 	MODEM_DBG("modem reset...\n");
- 	if(m->state != STATE_MODEM_IDLE)
- 		modem_hup(m,1);
diff --git a/net-dialup/slmodem/files/slmodem-2.9.init b/net-dialup/slmodem/files/slmodem-2.9.init
deleted file mode 100644
index ad03bb2a377b..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.init
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 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.13 2005/07/11 15:15:30 genstef Exp $
-
-if [ "${MODULE}" = "alsa" ];
-then
-	needalsasound="alsasound1"
-fi
-depend() {
-	need logger $needalsasound
-}
-
-
-checkconfig() {
-	if [ -z "${COUNTRY}" ]; then
-		eerror "You need to config /etc/conf.d/slmodem first"
-		return 1
-	fi
-}
-
-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_SLOT}
-	return ${?}
-}
-
-function loadsmodule {
-	modprobe ${MODULE};
-    
-	if [ "$?" -gt 0 ]
-	then
-		eerror "Missing ${MODULE}. Please set up /etc/conf.d/slmodem"
-		return 1;
-    	fi
-
-	if [ -z "${MDEV}" ]; then MDEV="/dev/${MODULE}0"; fi
-
-	#sleep as per http://bugs.gentoo.org/show_bug.cgi?id=77162
-	ebegin "Waiting for ${MODULE} modem driver initialisation"
-	local COUNT=0
-	if [ "$RC_NOCOLOR" != "yes" ]; then 
-		echo -e "\e[A\e[52G   "
-		echo -ne "\e[A\e[52G"
-	fi
-	while [ ! -c ${MDEV} -a ${COUNT} -lt 20 ];
-	do
-		sleep 0.5
-		echo -n "."
-		COUNT=`expr ${COUNT} + 1`
-   done
-
-	if [ "$RC_NOCOLOR" != "yes" ]; then echo; fi
- 
-	if [ ! -c ${MDEV} ];
-	then
-		eerror "Module - ${MODULE} failed to initialise device ${MDEV}"
-		return 1
-	else
-		eend 0 
-	fi
-
-    	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} ${MDEV}
-	return ${?}
-}
-
-start() {
-
-	checkconfig || return 1
-
-	# either if we use alsa or not, the only thing we need is 
-	# ttySL0, which is created by slmodemd when started (points to a pts)
-
-	if [ "${MODULE}" == "alsa" ]; then
-		loadsalsa
-	else
-		loadsmodule
-	fi
-    
-	result=${?}
-    
-	test ! -z "${LN_DEV}" && /bin/ln -s ${DEV} ${LN_DEV} 2> /dev/null
-    
-	eend ${result}
-}
-
-stop() {
-	ebegin "Shutting down slmodemd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/slmodemd.pid
-	result=${?}
-	[ -e /var/run/slmodemd.pid ] && rm /var/run/slmodemd.pid
-	unlink ${LN_DEV} 2> /dev/null
-	eend ${result}
-	if [ ! "${MODULE}" == "alsa" ];
-	then
-		ebegin "Waiting for ${MODULE} modem driver unload"
-		if [ "$RC_NOCOLOR" != "yes" ]; then
-			echo -e "\e[A\e[44G   "
-			echo -ne "\e[A\e[44G"
-		fi
-		for ((a=0,result=1; result==1 && a <= 5 ; a++))
-		do
-			sleep 0.25
-			echo -n "."
-			modprobe -r slamr 2> /dev/null && result=0
-		done
-		if [ "$RC_NOCOLOR" != "yes" ]; then echo; fi
-		eend ${result}
-	fi
-}
diff --git a/net-dialup/slmodem/files/slmodem-2.9.modules b/net-dialup/slmodem/files/slmodem-2.9.modules
deleted file mode 100644
index be8f6e6f6f20..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.modules
+++ /dev/null
@@ -1,13 +0,0 @@
-# slmodem 2.9.x kernel modules' configuration file
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.modules,v 1.2 2004/06/05 10:41:21 dragonheart Exp $
-
-## 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.
-# country nolonger a option
-#options slamr country=${COUNTRY}
-#options slusb country=${COUNTRY}
-
-alias char-major-212 slamr
-alias char-major-213 slusb
diff --git a/net-dialup/slmodem/files/slmodem-amd64-Makefile.diff b/net-dialup/slmodem/files/slmodem-amd64-Makefile.diff
deleted file mode 100644
index 78034e3df7d4..000000000000
--- a/net-dialup/slmodem/files/slmodem-amd64-Makefile.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur slmodem-2.9.11-20051009.orig/modem/Makefile slmodem-2.9.11-20051009/modem/Makefile
---- slmodem-2.9.11-20051009.orig/modem/Makefile	2005-10-15 12:40:18.000000000 +0200
-+++ slmodem-2.9.11-20051009/modem/Makefile	2005-10-15 12:42:20.000000000 +0200
-@@ -16,7 +16,7 @@
- CC:= gcc
- RM:= rm -f
- 
--CFLAGS:= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM
-+CFLAGS+= -Wall -g -I. -DCONFIG_DEBUG_MODEM
- 
- 
- modem-objs:= \
-@@ -33,12 +33,13 @@
- 
- #SUPPORT_ALSA:=1
- ifdef SUPPORT_ALSA
--slmodemd: -lasound
- CFLAGS+= -DSUPPORT_ALSA=1
-+LDFLAGS+= -L/usr/lib
-+LDLIBS+= -lasound
- endif
- 
- slmodemd modem_test:
--	$(CC) -o $@ $^
-+	$(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS)
- 
- clean:
- 	$(RM) slmodemd modem_test modem_main.o modem_cmdline.o modem_test.o $(modem-objs) $(dp-objs) $(sysdep-objs)
diff --git a/net-dialup/slmodem/files/slmodem-class-simple-to-class.diff b/net-dialup/slmodem/files/slmodem-class-simple-to-class.diff
deleted file mode 100644
index bc519005bf7c..000000000000
--- a/net-dialup/slmodem/files/slmodem-class-simple-to-class.diff
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -urNp slmodem-2.9.9d.orig/drivers/Makefile slmodem-2.9.9d/drivers/Makefile
---- slmodem-2.9.9d.orig/drivers/Makefile	2005-04-23 01:43:04.000000000 +0200
-+++ slmodem-2.9.9d/drivers/Makefile	2005-06-08 19:31:20.000000000 +0200
-@@ -18,7 +18,9 @@
- 
- KERNEL_DIR:=/lib/modules/$(shell uname -r)/build
- 
--EXTRA_CFLAGS = -I$(obj) -I$(obj)/../modem
-+FOUND_CLASS_SIMPLE := $(shell grep -q 'class_simple_device_add' ${KERNEL_DIR}/include/linux/device.h 2> /dev/null && echo -DFOUND_CLASS_SIMPLE)
-+
-+EXTRA_CFLAGS = -I$(obj) -I$(obj)/../modem $(FOUND_CLASS_SIMPLE)
- 
- obj-m := slamr.o slusb.o
- 
-@@ -61,7 +63,7 @@ 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
-+CFLAGS:= -Wall -pipe -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include $(FOUND_CLASS_SIMPLE)
- 
- all: $(obj-m)
- 
-diff -urNp slmodem-2.9.9d.orig/drivers/amrmo_init.c slmodem-2.9.9d/drivers/amrmo_init.c
---- slmodem-2.9.9d.orig/drivers/amrmo_init.c	2005-04-23 01:43:04.000000000 +0200
-+++ slmodem-2.9.9d/drivers/amrmo_init.c	2005-06-08 19:37:56.000000000 +0200
-@@ -283,7 +283,19 @@ MODULE_DEVICE_TABLE (pci, amrmo_pci_tbl)
- 
- static struct amrmo_struct *amrmo_table[MAXNUM] = {};
- #ifndef OLD_KERNEL
-+#ifdef FOUND_CLASS_SIMPLE
-+#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_simple_device_add(class, dev, device, fmt, rest)
-+#define CLASS_DESTROY(class) class_simple_destroy(class)
-+#define CLASS_DEVICE_DESTROY(class, dev) class_simple_device_remove(dev)
-+#define CLASS_CREATE(owner, name) class_simple_create(owner, name)
- static struct class_simple *amrmo_class;
-+#else
-+#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, dev, device, fmt, rest)
-+#define CLASS_DESTROY(class) class_destroy(class)
-+#define CLASS_DEVICE_DESTROY(class, dev) class_device_destroy(class, dev)
-+#define CLASS_CREATE(owner, name) class_create(owner, name)
-+static struct class *amrmo_class;
-+#endif
- #endif
- 
- /*
-@@ -629,7 +641,7 @@ static int __init amrmo_pci_probe(struct
- 	}
- #endif
- #else
--	class_simple_device_add(amrmo_class, MKDEV(AMRMO_MAJOR, i), NULL, "slamr%d", i);
-+	CLASS_DEVICE_CREATE(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;
-@@ -661,7 +673,7 @@ static void __exit amrmo_pci_remove(stru
- 	}
- #endif
- #else
--	class_simple_device_remove(MKDEV(AMRMO_MAJOR, amrmo->num));
-+	CLASS_DEVICE_DESTROY(amrmo_class, MKDEV(AMRMO_MAJOR, amrmo->num));
- 	devfs_remove("slamr%d", amrmo->num);
- #endif
- 	amrmo_table[amrmo->num] = NULL;
-@@ -745,7 +757,7 @@ static int __init amrmo_init(void)
- 	}
- 
- #ifndef OLD_KERNEL
--	amrmo_class = class_simple_create(THIS_MODULE, "slamr");
-+	amrmo_class = CLASS_CREATE(THIS_MODULE, "slamr");
- 	if (IS_ERR(amrmo_class)) {
- 		int err = PTR_ERR(amrmo_class);
- 		printk(KERN_ERR "slamr: failure creating simple class, error %d\n", err);
-@@ -755,7 +767,7 @@ static int __init amrmo_init(void)
- 	if ((err = pci_register_driver(&amrmo_pci_driver)) < 0) {
- 		pci_unregister_driver(&amrmo_pci_driver);
- #ifndef OLD_KERNEL
--		class_simple_destroy(amrmo_class);
-+		CLASS_DESTROY(amrmo_class);
- #endif
-                 return err;
- 	}
-@@ -763,7 +775,7 @@ static int __init amrmo_init(void)
- 	if(register_chrdev(AMRMO_MAJOR, "slamr", &amrmo_fops) < 0) {
- 		pci_unregister_driver(&amrmo_pci_driver);
- #ifndef OLD_KERNEL
--		class_simple_destroy(amrmo_class);
-+		CLASS_DESTROY(amrmo_class);
- #endif
- 		return -ENOMEM;
- 	}
-@@ -777,7 +789,7 @@ static void __exit amrmo_exit(void)
- 	unregister_chrdev(AMRMO_MAJOR,"slamr");
- 	pci_unregister_driver(&amrmo_pci_driver);
- #ifndef OLD_KERNEL
--	class_simple_destroy(amrmo_class);
-+	CLASS_DESTROY(amrmo_class);
- #endif
- }
- 
-diff -urNp slmodem-2.9.9d.orig/drivers/st7554.c slmodem-2.9.9d/drivers/st7554.c
---- slmodem-2.9.9d.orig/drivers/st7554.c	2005-04-23 01:43:04.000000000 +0200
-+++ slmodem-2.9.9d/drivers/st7554.c	2005-06-08 19:41:07.000000000 +0200
-@@ -206,7 +206,19 @@ struct st7554_state {
- 
- 
- static struct st7554_state *st7554_table[MAX_MODEMS] = {};
-+#ifdef FOUND_CLASS_SIMPLE
-+#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_simple_device_add(class, dev, device, fmt, rest)
-+#define CLASS_DESTROY(class) class_simple_destroy(class)
-+#define CLASS_DEVICE_DESTROY(class, dev) class_simple_device_remove(dev)
-+#define CLASS_CREATE(owner, name) class_simple_create(owner, name)
- static struct class_simple *st7554_class;
-+#else
-+#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, dev, device, fmt, rest)
-+#define CLASS_DESTROY(class) class_destroy(class)
-+#define CLASS_DEVICE_DESTROY(class, dev) class_device_destroy(class, dev)
-+#define CLASS_CREATE(owner, name) class_create(owner, name)
-+static struct class *st7554_class;
-+#endif
- 
- static DECLARE_MUTEX(open_sem);
- 
-@@ -1271,7 +1283,7 @@ static int st7554_probe(struct usb_inter
- 	}
- 
- 	usb_set_intfdata(interface, s );
--	class_simple_device_add(st7554_class, MKDEV(243, i), NULL, "slusb%d", i);
-+	CLASS_DEVICE_CREATE(st7554_class, MKDEV(243, i), NULL, "slusb%d", i);
- 	devfs_mk_cdev(MKDEV(243,i),S_IFCHR|S_IRUSR|S_IWUSR,"slusb%d",i);
- 
- 	USB_INFO(KERN_INFO "slusb: slusb%d is found.\n", s->minor);
-@@ -1300,7 +1312,7 @@ static void st7554_disconnect(struct usb
-                 return;
-         }
- 
--	class_simple_device_remove(MKDEV(243, s->minor));
-+	CLASS_DEVICE_DESTROY(st7554_class, MKDEV(243, s->minor));
-  	devfs_remove("slusb%d",s->minor);
- 
- 	st7554_stop(s);
-@@ -1334,7 +1346,7 @@ static int __init st7554_modem_init(void
- 	int ret;
- 	USB_INFO ("ST7554 USB Modem.\n");
- 
--	st7554_class = class_simple_create(THIS_MODULE, "slusb");
-+	st7554_class = CLASS_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);
-@@ -1344,13 +1356,13 @@ static int __init st7554_modem_init(void
- 	ret = usb_register(&st7554_usb_driver);
- 	if ( ret ) {
- 		USB_ERR ("st7554_modem_init: cannot register usb device.\n");
--		class_simple_destroy(st7554_class);
-+		CLASS_DESTROY(st7554_class);
- 		return ret;
- 	}
- 
- 	if(register_chrdev(243, "slusb", &st7554_fops) < 0) {
- 		usb_deregister(&st7554_usb_driver);
--		class_simple_destroy(st7554_class);
-+		CLASS_DESTROY(st7554_class);
- 		return -ENOMEM;
- 	}
- 	return 0;
-@@ -1362,7 +1374,7 @@ static void __exit st7554_modem_exit(voi
- 	USB_DBG ("st7554: exit...\n");
- 	unregister_chrdev(243,"slusb");
- 	usb_deregister(&st7554_usb_driver);
--	class_simple_destroy(st7554_class);
-+	CLASS_DESTROY(st7554_class);
- }
- 
- 
diff --git a/net-dialup/slmodem/files/slmodem-remove-URB_ASYNC_UNLINK.patch b/net-dialup/slmodem/files/slmodem-remove-URB_ASYNC_UNLINK.patch
deleted file mode 100644
index 035f2e519a0b..000000000000
--- a/net-dialup/slmodem/files/slmodem-remove-URB_ASYNC_UNLINK.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- slmodem-2.9.11-20050816.orig/drivers/st7554.c	2005-09-08 17:31:39.000000000 +0200
-+++ slmodem-2.9.11-20050816/drivers/st7554.c	2005-09-08 17:32:37.000000000 +0200
-@@ -282,6 +282,9 @@
- 
- #define BYTES_IN_FRAMES(s,n) ((((s)->srate*(n))/1000)<<(MFMT_BYTESSHIFT((s)->format)))
- 
-+#ifndef URB_ASYNC_UNLINK
-+#define URB_ASYNC_UNLINK 0
-+#endif
- #define FILL_URB(state,ch,u) { \
- 	(u)->dev = (state)->usbdev;  \
- 	(u)->pipe = (ch)->pipe; \
diff --git a/net-dialup/slmodem/slmodem-2.9.9d.ebuild b/net-dialup/slmodem/slmodem-2.9.9d.ebuild
deleted file mode 100644
index 2689e389ca89..000000000000
--- a/net-dialup/slmodem/slmodem-2.9.9d.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9d.ebuild,v 1.7 2005/10/16 09:11:45 mrness Exp $
-
-inherit eutils linux-mod
-
-DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://linmodems.technion.ac.il/packages/smartlink/"
-SRC_URI="http://linmodems.technion.ac.il/packages/smartlink/${P}.tar.gz"
-LICENSE="Smart-Link"
-SLOT="0"
-KEYWORDS="x86 -*"
-IUSE="alsa usb"
-
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	MODULE_NAMES="slamr(net:${S}/drivers)"
-	if useq usb; then
-		MODULE_NAMES="${MODULE_NAMES} slusb(net:${S}/drivers)"
-		CONFIG_CHECK="USB"
-	fi
-	BUILD_TARGETS="all"
-	linux-mod_pkg_setup
-	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.9.9b-gcc4.patch
-
-	convert_to_m drivers/Makefile
-}
-
-src_compile() {
-	local MAKE_PARAMS=""
-	if useq alsa; then
-		MAKE_PARAMS="SUPPORT_ALSA=1"
-	fi
-	emake ${MAKE_PARAMS} modem || die "failed to build modem"
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	cd ${S}
-	newsbin modem/modem_test slmodem_test
-	dosbin modem/slmodemd
-	dodir /var/lib/slmodem
-	fowners root:dialout /var/lib/slmodem
-	keepdir /var/lib/slmodem
-
-	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
-	exeinto /etc/init.d/; newexe ${FILESDIR}/${PN}-2.9.init ${PN}
-
-	# configure for alsa - or not for alsa
-	if useq alsa; then
-		sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \
-			-e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" ${D}/etc/conf.d/slmodem
-	else
-		sed -i "s/# MODULE=slamr/MODULE=slamr/" ${D}/etc/conf.d/slmodem
-	fi
-
-
-	# Add module aliases and install hotplug script
-	insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.modules ${PN}
-	if useq usb; then
-		exeinto /etc/hotplug/usb; newexe ${FILESDIR}/slusb.hotplug slusb
-	fi
-
-	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/${PN}
-
-	# Add configuration for devfs, udev
-	if [ -e ${ROOT}/dev/.devfsd ] ; then
-		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
-	elif [ -e ${ROOT}/dev/.udev ] ; then
-		dodir /etc/udev/rules.d/
-		echo 'KERNEL="slamr", NAME="slamr0" GROUP="dialout"' > \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-		echo 'KERNEL="slusb", NAME="slusb0" GROUP="dialout"' >> \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
-	fi
-
-	dodoc Changes README
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Make some devices if we aren't using devfs or udev
-	if [ -e ${ROOT}/dev/.devfsd ]; then
-		ebegin "Restarting devfsd to reread devfs rules"
-			killall -HUP devfsd
-		eend $?
-
-	elif [ -e ${ROOT}/dev/.udev ]; then
-		ebegin "Restarting udev to reread udev rules"
-			udevstart
-		eend $?
-	else
-		cd ${S}/drivers
-		make DESTDIR=${ROOT} install-devices
-	fi
-
-	if [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
-	fi
-
-	ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"
-	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/modules.d/alsa"
-		einfo 'to: "alias snd-card-(number) snd-intel8x0m"'
-	fi
-
-	einfo "You need to be in the uucp AND dialout group to make calls as a user."
-}