Removing fcdslusb patch.. it does not work and is not needed.

Package-Manager: portage-1.585-cvs

4 files changed, 9 insertions, 102 deletions

diff --git a/net-dialup/fcdsl/ChangeLog b/net-dialup/fcdsl/ChangeLog
index b99f14c19f84..2cdbab95e2c9 100644
--- a/net-dialup/fcdsl/ChangeLog
+++ b/net-dialup/fcdsl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/fcdsl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.12 2005/03/09 05:53:26 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/ChangeLog,v 1.13 2005/03/19 22:39:45 genstef Exp $
+
+  19 Mar 2005; Stefan Schweizer <genstef@gentoo.org> -files/fcdslusb.diff,
+  fcdsl-2.6.20.7-r4.ebuild:
+  Removing fcdslusb patch.. it does not work and is not needed.
 
   09 Mar 2005; Alin Nastac <mrness@gentoo.org> -fcdsl-2.6.20.7-r2.ebuild,
   -fcdsl-2.6.20.7-r3.ebuild:
diff --git a/net-dialup/fcdsl/Manifest b/net-dialup/fcdsl/Manifest
index fb5809b06f93..94d81f5dc506 100644
--- a/net-dialup/fcdsl/Manifest
+++ b/net-dialup/fcdsl/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e161a170b4d85cbd0243ba44553d261c ChangeLog 2652
+MD5 978fa60166070e8cf20921093462a06c ChangeLog 2821
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 ae2409fa2559d25cecf4c69bbb691611 fcdsl-2.6.20.7-r4.ebuild 7398
+MD5 2b1fbe90911df37e91a1fbf894ed4c6e fcdsl-2.6.20.7-r4.ebuild 7448
 MD5 35e156955da1166d6de5e56bb66857db files/fcdslslusb.diff 4002
 MD5 776e0c65eda5432a30f9beae8896ca97 files/fcdslsl.diff 1896
 MD5 22a65f3dcb8b67dc53a23ef35886bf18 files/fcdsl.diff 4636
-MD5 294902b3dadf7b52b7093305a97c8ff7 files/fcdslusb.diff 2440
 MD5 7d0d40b4547c891577925915b046cffc files/digest-fcdsl-2.6.20.7-r4 381
 MD5 4d073842f89f61ce68ae5ee7ac100d70 files/fcdsl2.diff 1867
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCLo9hjiC39V7gKu0RAsnFAJ9byjI7rKw3AXRNVWLgrdCMcIbBNACgvc2j
-oNbZTELiGW+s8CDwEQWoJPQ=
-=y5hs
------END PGP SIGNATURE-----
diff --git a/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild b/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild
index 2a8b9fe951d4..6cdc9d22d24b 100644
--- a/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild
+++ b/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild,v 1.3 2005/03/05 16:06:46 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/fcdsl/fcdsl-2.6.20.7-r4.ebuild,v 1.4 2005/03/19 22:39:45 genstef Exp $
 
 inherit linux-mod eutils
 
@@ -68,7 +68,7 @@ src_unpack() {
 		tar xzf ${DISTDIR}/${FCDSL_FILES[CARD]}.tar.gz
 		mv fritz ${FCDSL_MODULES[CARD]/fc/fritz.}
 		cd ${FCDSL_MODULES[CARD]/fc/fritz.}/src
-		patch -p0 < ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff
+		[ -f ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff ] && patch -p0 < ${FILESDIR}/${FCDSL_MODULES[CARD]}.diff
 		cd ../..
 	done
 
diff --git a/net-dialup/fcdsl/files/fcdslusb.diff b/net-dialup/fcdsl/files/fcdslusb.diff
deleted file mode 100644
index 922cad2629d0..000000000000
--- a/net-dialup/fcdsl/files/fcdslusb.diff
+++ /dev/null
@@ -1,86 +0,0 @@
---- driver.c.orig	2004-05-14 02:00:00.000000000 +0200
-+++ driver.c	2005-02-26 11:26:41.000000000 +0100
-@@ -18,6 +18,10 @@
-  * http://www.opensource.org/licenses/lgpl-license.html
-  * 
-  * Contact: AVM GmbH, Alt-Moabit 95, 10559 Berlin, Germany, email: info@avm.de
-+ *
-+ * Mon Oct 20 22:43:31 2003
-+ * Modified by Joerg Lehrke to improve locking 
-+ * Fixed for rev 0.4.1 by Stefan Schweizer
-  */
- 
- #include <asm/atomic.h>
-@@ -46,6 +50,8 @@
- #include "main.h"
- #include "driver.h"
- 
-+#undef SINGLE_LOCK
-+
- #ifndef HZ
- # error HZ is not defined...
- #endif
-@@ -76,7 +82,11 @@ static atomic_t			crit_count		= ATOMIC_I
- static volatile int		hard_error_issued;
- static atomic_t			tx_flag			= ATOMIC_INIT (0);
- static atomic_t			rx_flag			= ATOMIC_INIT (0);
-+#if defined (SINGLE_LOCK)
-+# define stack_lock qt_lock
-+#else
- static spinlock_t		stack_lock		= SPIN_LOCK_UNLOCKED;
-+#endif
- static int			thread_pid		= -1;
- static atomic_t			thread_flag;
- static atomic_t			thread_capi_flag;
-@@ -1367,15 +1377,20 @@ static void tx_handler (card_p pdc) {
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/ 
- static void tx_task (unsigned long data) {
--
-+	unsigned long flags;
- 	UNUSED_ARG (data);
-+
- 	if (in_critical ()) {
- 		atomic_set (&tx_flag, 1);
--	} else if (spin_trylock (&stack_lock)) {
--		tx_handler (capi_card);
--		spin_unlock (&stack_lock);
- 	} else {
--		atomic_set (&tx_flag, 1);
-+		local_irq_save(flags);
-+		if (spin_trylock (&stack_lock)) {
-+			tx_handler (capi_card);
-+			spin_unlock (&stack_lock);
-+		} else {
-+			atomic_set (&tx_flag, 1);
-+		}
-+		local_irq_restore(flags);
- 	}
- } /* tx_task */
- 
-@@ -1412,15 +1427,20 @@ static void rx_handler (card_p pdc) {
- /*---------------------------------------------------------------------------*\
- \*---------------------------------------------------------------------------*/ 
- static void rx_task (unsigned long data) {
--
-+	unsigned long flags;
- 	UNUSED_ARG (data);
-+
- 	if (in_critical ()) {
- 		atomic_set (&rx_flag, 1);
--	} else if (spin_trylock (&stack_lock)) {
--		rx_handler (capi_card);
--		spin_unlock (&stack_lock);
- 	} else {
--		atomic_set (&rx_flag, 1);
-+		local_irq_save(flags);
-+		if (spin_trylock (&stack_lock)) {
-+			tx_handler (capi_card);
-+			spin_unlock (&stack_lock);
-+		} else {
-+			atomic_set (&tx_flag, 1);
-+		}
-+		local_irq_restore(flags);
- 	}
- } /* rxi_task */
-