6 files changed, 19 insertions, 90 deletions
diff --git a/net-dialup/hcfusbmodem/ChangeLog b/net-dialup/hcfusbmodem/ChangeLog
index 8d0f6ae7685e..3b813a7e37da 100644
--- a/net-dialup/hcfusbmodem/ChangeLog
+++ b/net-dialup/hcfusbmodem/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/hcfusbmodem
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.17 2006/02/21 23:19:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.18 2006/05/14 08:21:24 mrness Exp $
+
+  14 May 2006; Alin Nastac <mrness@gentoo.org>
+  -files/hcfusbmodem-1.07-upstream-20060122.patch, -hcfusbmodem-1.07.ebuild,
+  hcfusbmodem-1.10.ebuild:
+  Remove obsolete version.
 
 *hcfusbmodem-1.10 (21 Feb 2006)
 
diff --git a/net-dialup/hcfusbmodem/Manifest b/net-dialup/hcfusbmodem/Manifest
index b3ecb4e30397..0b7b1c3ad8ab 100644
--- a/net-dialup/hcfusbmodem/Manifest
+++ b/net-dialup/hcfusbmodem/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 13ffa4121a0e5f63ba09748e34f2fce3 ChangeLog 2794
 MD5 44b816e7b9c1bfb6a4c4e46f7a19ef31 files/digest-hcfusbmodem-1.10 79
 MD5 5f104b79ec40a60f0f6f04b0d3f8c1aa hcfusbmodem-1.10.ebuild 847
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEZuiSjG8pv1lIUX4RAumxAJ4wOoblDcImHE7ZyXBd7TvDgApm8QCfck/C
+uMZtBBEeTqL7AvQsjW6bxFs=
+=VCUk
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.07 b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.07
deleted file mode 100644
index 94cefe1cdcfe..000000000000
--- a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.07
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 6238946b1615..000000000000
--- a/net-dialup/hcfusbmodem/files/hcfusbmodem-1.07-upstream-20060122.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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.07.ebuild b/net-dialup/hcfusbmodem/hcfusbmodem-1.07.ebuild
deleted file mode 100644
index 6a1a9a34dc4b..000000000000
--- a/net-dialup/hcfusbmodem/hcfusbmodem-1.07.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.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"
-HOMEPAGE="http://www.linuxant.com/drivers/"
-
-IUSE=""
-SLOT="0"
-LICENSE="Conexant"
-KEYWORDS="~ppc"
-DEPEND="virtual/libc"
-
-S="${WORKDIR}/${P}powerpcfull"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-upstream-20060122.patch
-}
-
-src_compile() {
-	emake all || die
-}
-
-src_install () {
-	make PREFIX=${D}/usr/ ROOT=${D} install || die
-}
-
-pkg_postinst() {
-	einfo "To complete the installation and configuration of your HCF modem,"
-	einfo "please run hcfusbconfig."
-}
diff --git a/net-dialup/hcfusbmodem/hcfusbmodem-1.10.ebuild b/net-dialup/hcfusbmodem/hcfusbmodem-1.10.ebuild
index 11035f0f5d04..77b2581facde 100644
--- a/net-dialup/hcfusbmodem/hcfusbmodem-1.10.ebuild
+++ b/net-dialup/hcfusbmodem/hcfusbmodem-1.10.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/hcfusbmodem/hcfusbmodem-1.10.ebuild,v 1.1 2006/02/21 23:19:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/hcfusbmodem-1.10.ebuild,v 1.2 2006/05/14 08:21:24 mrness Exp $
 
 inherit linux-info eutils
 
@@ -19,11 +19,11 @@ DEPEND="dev-lang/perl
 S="${WORKDIR}/${P}powerpcfull"
 
 src_compile() {
-	emake all || die
+	emake all || die "make failed"
 }
 
 src_install () {
-	make PREFIX="${D}/usr/" ROOT="${D}" install || die
+	make PREFIX="${D}/usr/" ROOT="${D}" install || die "make install failed"
 }
 
 pkg_postinst() {