6 files changed, 75 insertions, 20 deletions
diff --git a/net-dialup/hcfusbmodem/ChangeLog b/net-dialup/hcfusbmodem/ChangeLog
index ec590861781b..856299e5c917 100644
--- a/net-dialup/hcfusbmodem/ChangeLog
+++ b/net-dialup/hcfusbmodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/hcfusbmodem
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.15 2005/09/17 09:20:52 mrness Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.16 2006/01/22 20:33:16 mrness Exp $
+
+*hcfusbmodem-1.07 (22 Jan 2006)
+
+  22 Jan 2006; Alin Nastac <mrness@gentoo.org>
+  +files/hcfusbmodem-1.07-upstream-20060122.patch, -hcfusbmodem-1.06.ebuild,
+  +hcfusbmodem-1.07.ebuild:
+  Remove old version. Version bump.
 
 *hcfusbmodem-1.06-r1 (17 Sep 2005)
 
diff --git a/net-dialup/hcfusbmodem/Manifest b/net-dialup/hcfusbmodem/Manifest
index 35699c3d030c..0177bd5df66b 100644
--- a/net-dialup/hcfusbmodem/Manifest
+++ b/net-dialup/hcfusbmodem/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ebc35641f7d0128e5bcc0fb0225a7300 hcfusbmodem-1.06.ebuild 763
 MD5 0adb9c42c948b504f34c91d5d72de719 ChangeLog 2126
-MD5 c09ae1bd5eee588acb316f2e99ffc5d9 hcfusbmodem-1.06-r1.ebuild 989
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 2ea75e584ddedfbb0c19b75beadad4d7 files/digest-hcfusbmodem-1.06-r1 79
-MD5 3e9febdb259b7acf520e55bdba23ee3f files/hcfusbmodem-1.06-simple_class.patch 5208
+MD5 2a403db75a54fc1d6a5919dd04eceb67 files/digest-hcfusbmodem-1.07 79
 MD5 c1d8ec1dd9eeb532a9fcda19dc2f4191 files/hcfusbmodem-1.06-USB_byteorder.patch 1983
-MD5 2ea75e584ddedfbb0c19b75beadad4d7 files/digest-hcfusbmodem-1.06 79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK+AJNSP4Vda7IdsRAkCfAKCPOJXz3C6UA20OCA0yLZki5o5/twCeNjEY
-3Ro5+frSMitLuAkuzZ7FuPc=
-=clg0
------END PGP SIGNATURE-----
+MD5 3e9febdb259b7acf520e55bdba23ee3f files/hcfusbmodem-1.06-simple_class.patch 5208
+MD5 85acf4a37786a8a5ccba994c209a1f23 files/hcfusbmodem-1.07-upstream-20060122.patch 2665
+MD5 c09ae1bd5eee588acb316f2e99ffc5d9 hcfusbmodem-1.06-r1.ebuild 989
+MD5 57c9249882a572bee24e073bf4ff7a6a hcfusbmodem-1.07.ebuild 874
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
diff --git a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.06 b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.06
deleted file mode 100644
index 645a5609ddd6..000000000000
--- a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.06
+++ /dev/null
@@ -1 +0,0 @@
-MD5 77a03fe1ca3f137ed403bb3d9f7ba212 hcfusbmodem-1.06powerpcfull.tar.gz 600498
diff --git a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.07 b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.07
new file mode 100644
index 000000000000..94cefe1cdcfe
--- /dev/null
+++ b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.07
@@ -0,0 +1 @@
+MD5 85f5acbe2493f432beddfaa067ada73f hcfusbmodem-1.07powerpcfull.tar.gz 605685
diff --git a/net-dialup/hcfusbmodem/files/hcfusbmodem-1.07-upstream-20060122.patch b/net-dialup/hcfusbmodem/files/hcfusbmodem-1.07-upstream-20060122.patch
new file mode 100644
index 000000000000..6238946b1615
--- /dev/null
+++ b/net-dialup/hcfusbmodem/files/hcfusbmodem-1.07-upstream-20060122.patch
@@ -0,0 +1,49 @@
+diff -Nur hcfusbmodem-1.07powerpcfull.orig/modules/GPL/oscompat.h hcfusbmodem-1.07powerpcfull/modules/GPL/oscompat.h
+--- hcfusbmodem-1.07powerpcfull.orig/modules/GPL/oscompat.h	2005-09-18 00:42:03.000000000 +0300
++++ hcfusbmodem-1.07powerpcfull/modules/GPL/oscompat.h	2006-01-22 22:18:59.000000000 +0200
+@@ -550,7 +550,11 @@
+ #define CLASS_DEVICE_DESTROY(class, dev) class_simple_device_remove(dev)
+ #define CLASS_CREATE(owner, name) class_simple_create(owner, name)
+ #else
++#ifdef FOUND_CLASS_DEVICE_PARENT
++#define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, NULL, dev, device, fmt, rest)
++#else
+ #define CLASS_DEVICE_CREATE(class, dev, device, fmt, rest) class_device_create(class, dev, device, fmt, rest)
++#endif
+ #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)
+diff -Nur hcfusbmodem-1.07powerpcfull.orig/modules/Makefile hcfusbmodem-1.07powerpcfull/modules/Makefile
+--- hcfusbmodem-1.07powerpcfull.orig/modules/Makefile	2005-09-19 20:09:27.000000000 +0300
++++ hcfusbmodem-1.07powerpcfull/modules/Makefile	2006-01-22 22:27:21.845486500 +0200
+@@ -79,8 +79,10 @@
+ 
+ FOUND_CLASS_SIMPLE := $(shell grep -q 'class_simple_device_add' ${REAL_KERNELSRC}/include/linux/device.h 2> /dev/null && echo -DFOUND_CLASS_SIMPLE)
+ FOUND_UART_REGISTER_PORT := $(shell grep -q 'uart_register_port' ${CNXT_KERNELSRC}/include/linux/serial_core.h 2>/dev/null && echo -DFOUND_UART_REGISTER_PORT)
+-
+-CFLAGS+= $(FOUND_CLASS_SIMPLE) $(FOUND_UART_REGISTER_PORT)
++FOUND_CLASS_DEVICE_PARENT := $(shell grep -q 'struct[ \t]*class_device[ \t]*\*[ \t]*parent' ${REAL_KERNELSRC}/include/linux/device.h 2>/dev/null && echo -DFOUND_CLASS_DEVICE_PARENT)
++FOUND_REFRIGERATOR := $(shell grep -q 'refrigerator' ${REAL_KERNELSRC}/include/linux/suspend.h 2>/dev/null && echo -DFOUND_REFRIGERATOR)
++  
++CFLAGS+= $(FOUND_CLASS_SIMPLE) $(FOUND_UART_REGISTER_PORT) $(FOUND_CLASS_DEVICE_PARENT) $(FOUND_REFRIGERATOR)
+ 
+ else
+ KO= o
+diff -Nur hcfusbmodem-1.07powerpcfull.orig/modules/osservices.c hcfusbmodem-1.07powerpcfull/modules/osservices.c
+--- hcfusbmodem-1.07powerpcfull.orig/modules/osservices.c	2005-09-11 08:29:12.000000000 +0300
++++ hcfusbmodem-1.07powerpcfull/modules/osservices.c	2006-01-22 22:19:06.000000000 +0200
+@@ -519,8 +519,13 @@
+ 
+ 			if(signal_pending(current)) {
+ 				handle_sigs();
+-			} else
++			} else {
++#ifdef FOUND_REFRIGERATOR
++				if (current->flags & PF_FREEZE)
++					refrigerator(PF_FREEZE);
++#endif
+ 				schedule();
++			}
+ 		}
+ 		current->state = TASK_RUNNING;
+ 		remove_wait_queue(&osthrd->wq, &wait);
diff --git a/net-dialup/hcfusbmodem/hcfusbmodem-1.06.ebuild b/net-dialup/hcfusbmodem/hcfusbmodem-1.07.ebuild
index 250c110b4ace..6a1a9a34dc4b 100644
--- a/net-dialup/hcfusbmodem/hcfusbmodem-1.06.ebuild
+++ b/net-dialup/hcfusbmodem/hcfusbmodem-1.07.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/hcfusbmodem-1.06.ebuild,v 1.1 2005/06/24 05:30:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/hcfusbmodem-1.07.ebuild,v 1.1 2006/01/22 20:33:16 mrness Exp $
+
+inherit linux-info eutils
 
 DESCRIPTION="hcfusbmodem - Modem driver for Connexant HSF chipset"
 SRC_URI="http://www.linuxant.com/drivers/hcf/full/archive/${P}powerpcfull.tar.gz"
@@ -14,6 +16,12 @@ DEPEND="virtual/libc"
 
 S="${WORKDIR}/${P}powerpcfull"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-upstream-20060122.patch
+}
+
 src_compile() {
 	emake all || die
 }