8 files changed, 25 insertions, 66 deletions
diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index e8352e466a21..6718b8a45890 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.35 2005/01/06 23:12:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.36 2005/01/12 20:53:14 dsd Exp $
+
+*slmodem-2.9.9a (12 Jan 2005)
+
+  12 Jan 2005; Daniel Drake <dsd@gentoo.org>
+  -files/slmodem-2.9.10-fix-for-2.6.10.patch,
+  -files/slmodem-2.9.10-pci-workaround.patch,
+  -files/slmodem-2.9.10-usb_endpoint_halted-gentoo.patch,
+  +files/slmodem-usb_endpoint_halted-gentoo.patch, slmodem-2.9.10-r3.ebuild,
+  -slmodem-2.9.10-r4.ebuild, +slmodem-2.9.9a.ebuild:
+  Revert to 2.9.9 due to licensing issues. This is the linmodems release with
+  some ALSA and 2.6.10 fixes included.
 
 *slmodem-2.9.10-r4 (07 Jan 2005)
 
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 2ded20e2ef82..9519bf48ae8d 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d8a103e82447a32a2c636c188b407f65 slmodem-2.9.10-r1.ebuild 3964
-MD5 ab42ccef7b4effd4cea1880ffa1d0f94 ChangeLog 8607
+MD5 d792cdf12cd8faa1ae17b39ea2c740d0 slmodem-2.9.10-r3.ebuild 4097
+MD5 2bf2a45e9ca8133fa20274abf03301bf slmodem-2.9.9a.ebuild 3878
+MD5 cc8082012d49641f37b9678ade6a425f ChangeLog 9081
 MD5 93dd8a9d0c0f815e8445d9f0c1fc0910 metadata.xml 578
-MD5 d6c8d01c1a46cc2860dbf07fc734044c slmodem-2.9.10-r4.ebuild 4029
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
-MD5 026f2e2fae1fbd999455b36630164a88 files/slmodem-2.9.10-usb_endpoint_halted-gentoo.patch 830
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
-MD5 66761da676b75588b6070bb128104c13 files/slmodem-2.9.10-pci-workaround.patch 872
 MD5 67543ad2e41e6dbc2150057340bb82b1 files/slmodem-2.9.conf 752
 MD5 64d03a3c87a5330faa6b8dd9d344b6a3 files/slmodem-2.9.init 2657
+MD5 ef9ad53b66480e01974b9f183e4edbc8 files/digest-slmodem-2.9.9a 66
 MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r1 66
-MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r4 66
+MD5 ccc7e1460f0678c4e3e8b8c3747834a5 files/digest-slmodem-2.9.10-r3 66
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
-MD5 190cd2721bad42e351959ae4c90fa812 files/slmodem-2.9.10-fix-for-2.6.10.patch 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB3cXhjiC39V7gKu0RAnPEAJ9/4P08njN3vUk1BX2JhyKDgiINngCg2uk/
-taKIXSY+t3qe6xUeZO/RPfs=
-=NsBP
------END PGP SIGNATURE-----
+MD5 026f2e2fae1fbd999455b36630164a88 files/slmodem-usb_endpoint_halted-gentoo.patch 830
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.10-r4 b/net-dialup/slmodem/files/digest-slmodem-2.9.10-r4
deleted file mode 100644
index b6aff29497e8..000000000000
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.10-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbc4918f2ee9ed4952d3f4309d364b35 slmodem-2.9.10.tar.gz 806884
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.9a b/net-dialup/slmodem/files/digest-slmodem-2.9.9a
new file mode 100644
index 000000000000..e1578e200497
--- /dev/null
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.9a
@@ -0,0 +1 @@
+MD5 2330415f6b60b4eb4593592abb09da7b slmodem-2.9.9a.tar.gz 709728
diff --git a/net-dialup/slmodem/files/slmodem-2.9.10-fix-for-2.6.10.patch b/net-dialup/slmodem/files/slmodem-2.9.10-fix-for-2.6.10.patch
deleted file mode 100644
index d2035b6d2fef..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.10-fix-for-2.6.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From Linux 2.6.10 onwards, pci_register_driver returns 0 on success and negative on failure
-
-- Daniel Drake <dsd@gentoo.org>
-
---- slmodem-2.9.10/drivers/amrmo_init.c.orig	2004-12-25 23:53:51.345258848 +0000
-+++ slmodem-2.9.10/drivers/amrmo_init.c	2004-12-25 23:54:33.528845968 +0000
-@@ -740,7 +740,7 @@
- 	}
- #endif
- 
--	if (!pci_register_driver(&amrmo_pci_driver)) {
-+	if (pci_register_driver(&amrmo_pci_driver) < 0) {
- 		pci_unregister_driver(&amrmo_pci_driver);
- #ifndef OLD_KERNEL
- 		class_simple_destroy(amrmo_class);
diff --git a/net-dialup/slmodem/files/slmodem-2.9.10-pci-workaround.patch b/net-dialup/slmodem/files/slmodem-2.9.10-pci-workaround.patch
deleted file mode 100644
index a24ef1279e23..000000000000
--- a/net-dialup/slmodem/files/slmodem-2.9.10-pci-workaround.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-get_device, put_device and device_release_driver are no longer available to non-GPL modules.
-The whole process of unregistering the device from another driver seems dodgy, lets just skip it
-
---- slmodem-2.9.10/drivers/amrmo_init.c.orig	2005-01-03 14:52:23.178287912 +0000
-+++ slmodem-2.9.10/drivers/amrmo_init.c	2005-01-03 15:06:46.603027400 +0000
-@@ -718,15 +718,8 @@
- 				dev->driver->remove(dev);
- 			dev->driver = NULL;
- #else
--			struct device *reldev = get_device(&dev->dev);
--			AMRMO_DBG("device %04x:%04x is grabbed by driver %s: try to release\n",
--				  dev->vendor,dev->device,
--				  (reldev&&reldev->driver)?
--				   reldev->driver->name:"unknown");
--			if (reldev) {
--				device_release_driver(reldev);
--				put_device(reldev);
--			}
-+			AMRMO_DBG("device %04x:%04x is grabbed by another driver, ignoring",
-+				  dev->vendor,dev->device);
- #endif
- 		}
- 	}
diff --git a/net-dialup/slmodem/files/slmodem-2.9.10-usb_endpoint_halted-gentoo.patch b/net-dialup/slmodem/files/slmodem-usb_endpoint_halted-gentoo.patch
index 23ce7001b04d..23ce7001b04d 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.10-usb_endpoint_halted-gentoo.patch
+++ b/net-dialup/slmodem/files/slmodem-usb_endpoint_halted-gentoo.patch
diff --git a/net-dialup/slmodem/slmodem-2.9.10-r4.ebuild b/net-dialup/slmodem/slmodem-2.9.9a.ebuild
index 2b7277373a5d..204d2fc3ca3e 100644
--- a/net-dialup/slmodem/slmodem-2.9.10-r4.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.9a.ebuild
@@ -1,12 +1,12 @@
 # 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.10-r4.ebuild,v 1.1 2005/01/06 23:12:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.9a.ebuild,v 1.1 2005/01/12 20:53:14 dsd Exp $
 
 inherit eutils linux-mod
 
 DESCRIPTION="Driver for Smart Link modem"
-HOMEPAGE="http://www.smlink.com/"
-SRC_URI="http://www.smlink.com/main/down/${P}.tar.gz"
+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 -*"
@@ -14,7 +14,6 @@ IUSE="alsa usb"
 
 DEPEND="virtual/libc
 	alsa? ( media-libs/alsa-lib )
-	virtual/os-headers
 	>=sys-apps/sed-4"
 
 RDEPEND="virtual/libc
@@ -34,19 +33,16 @@ pkg_setup() {
 	fi
 
 	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNEL_DIR=${KV_DIR}"
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-usb_endpoint_halted-gentoo.patch || die "failed to apply usb_endpoint patch"
-	epatch ${FILESDIR}/${P}-pci-workaround.patch || die "failed to apply pci workaround patch"
 
-	convert_to_m drivers/Makefile
+	epatch ${FILESDIR}/${PN}-usb_endpoint_halted-gentoo.patch || die "failed to apply usb_endpoint patch"
 
-	if kernel_is ge 2 6 10; then
-		epatch ${FILESDIR}/${P}-fix-for-2.6.10.patch || die "failed to apply fix for kernels >= 2.6.10"
-	fi
+	convert_to_m drivers/Makefile
 }
 
 src_compile() {