Add upstream fix for suspend2 kernel patch.

(Portage version: 2.0.53)

5 files changed, 48 insertions, 15 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index bc91b9230588..28cb84bd3595 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/hcfpcimodem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.21 2006/02/21 23:11:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.22 2006/03/10 14:30:39 mrness Exp $
+
+*hcfpcimodem-1.10-r1 (10 Mar 2006)
+
+  10 Mar 2006; Alin Nastac <mrness@gentoo.org>
+  +files/hcfpcimodem-1.10-suspend2.patch, -hcfpcimodem-1.10.ebuild,
+  +hcfpcimodem-1.10-r1.ebuild:
+  Add upstream fix for suspend2 kernel patch.
 
 *hcfpcimodem-1.10 (21 Feb 2006)
 
diff --git a/net-dialup/hcfpcimodem/Manifest b/net-dialup/hcfpcimodem/Manifest
index 107408d5fea3..34bb40581c9b 100644
--- a/net-dialup/hcfpcimodem/Manifest
+++ b/net-dialup/hcfpcimodem/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fd9071afd940f2e2dd387bcef65d9a3a ChangeLog 3808
 MD5 25fc41dea981da0f005db63a43768868 files/digest-hcfpcimodem-1.06-r1 144
 MD5 395bd74ffc3553d4ef151865b7601bb1 files/digest-hcfpcimodem-1.08 144
 MD5 a2b09ba68937c610b9c2f5156690c3a4 files/digest-hcfpcimodem-1.10 144
+MD5 a2b09ba68937c610b9c2f5156690c3a4 files/digest-hcfpcimodem-1.10-r1 144
 MD5 790c0fbf3202d068fbb35b11296985c2 files/hcfpcimodem-1.06-simple_class.patch 5124
 MD5 9ec542df181d86f49f4d66377de83a59 files/hcfpcimodem-1.08-upstream-20051215.patch 2777
+MD5 d49ba111af3016191da29fc85232ae77 files/hcfpcimodem-1.10-suspend2.patch 800
 MD5 78b35559c72b662ac59d18d5c59ab93f hcfpcimodem-1.06-r1.ebuild 1904
 MD5 9180a9a60e4066ac19d6caaba94f527b hcfpcimodem-1.08.ebuild 1859
+MD5 ea4b7e5ba5d2df63817c5739fbbc7859 hcfpcimodem-1.10-r1.ebuild 1886
 MD5 82cce9c3134c78f5cb5da3248e41c378 hcfpcimodem-1.10.ebuild 1777
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+548jG8pv1lIUX4RAmk7AKCePP0VnVCwX9CIOhsdVlf/thOdMACeI+A/
-WFT68L4VJJFhbgxA+cBlblU=
-=zico
------END PGP SIGNATURE-----
diff --git a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10 b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10-r1
index 3abd71036426..3abd71036426 100644
--- a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10
+++ b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10-r1
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.10-suspend2.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.10-suspend2.patch
new file mode 100644
index 000000000000..95b545e77a82
--- /dev/null
+++ b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.10-suspend2.patch
@@ -0,0 +1,27 @@
+diff -urN hcfpcimodem-1.10full/modules/osservices.c hcfpcimodem-1.10full-suspend2/modules/osservices.c
+--- hcfpcimodem-1.10full/modules/osservices.c	2006-02-08 01:27:25.000000000 -0500
++++ hcfpcimodem-1.10full-suspend2/modules/osservices.c	2006-03-06 14:40:19.000000000 -0500
+@@ -28,9 +28,22 @@
+ #include <linux/smp_lock.h>
+ #include <linux/file.h>
+ #include <linux/kmod.h>
++
+ #ifdef FOUND_LINUX_SUSPEND
++#define UINT8 UINT8_suspend
++#define BOOL BOOL_suspend
++#define UINT16 UINT16_suspend
++#define UINT32 UINT32_suspend
++#define INT32 INT32_suspend
++#undef INT64
+ #include <linux/suspend.h>
+-#endif
++#undef UINT8
++#undef BOOL
++#undef UINT16
++#undef UINT32
++#undef INT32
++#endif /* FOUND_LINUX_SUSPEND */
++
+ #if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,7) )
+ #include <linux/completion.h>
+ #endif
diff --git a/net-dialup/hcfpcimodem/hcfpcimodem-1.10.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r1.ebuild
index 86c0a3d710d7..425e745d0afc 100644
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.10.ebuild
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.10.ebuild,v 1.1 2006/02/21 23:11:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r1.ebuild,v 1.1 2006/03/10 14:30:39 mrness Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ DEPEND="dev-lang/perl
 
 S="${WORKDIR}/${P}full"
 
-pkg_setup () {
+pkg_setup() {
 	MOD_N="hcfpci"
 	# Check to see if module is inserted into kernel, otherwise, build fails
 	if [ "`lsmod | sed '/^'$MOD_N'serial/!d'`" ]; then
@@ -44,8 +44,14 @@ pkg_setup () {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-suspend2.patch"
+}
+
 src_compile() {
-	emake all || die
+	emake all || die "make failed"
 }
 
 pkg_preinst() {
@@ -58,7 +64,7 @@ pkg_preinst() {
 }
 
 src_install () {
-	make PREFIX="${D}/usr/" ROOT="${D}" install || die
+	make PREFIX="${D}/usr/" ROOT="${D}" install || die "make install failed"
 
 	use doc && dodoc "${DISTDIR}/${MY_DOC}"
 }