x86; version bump (#115582)

(Portage version: 2.0.51.22-r3)

6 files changed, 141 insertions, 13 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index 7b99eecaf3cf..eed5dd563e2a 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/hcfpcimodem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.19 2005/09/17 09:11:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.20 2005/12/14 23:29:56 mrness Exp $
+
+*hcfpcimodem-1.08 (14 Dec 2005)
+
+  14 Dec 2005; Alin Nastac <mrness@gentoo.org>
+  +files/hcfpcimodem-1.08-upstream-20051215.patch,
+  hcfpcimodem-1.06-r1.ebuild, +hcfpcimodem-1.08.ebuild:
+  Stable on x86. Version bump (#115582).
 
 *hcfpcimodem-1.06-r1 (17 Sep 2005)
 
diff --git a/net-dialup/hcfpcimodem/Manifest b/net-dialup/hcfpcimodem/Manifest
index b92eb7522f89..536f66102fef 100644
--- a/net-dialup/hcfpcimodem/Manifest
+++ b/net-dialup/hcfpcimodem/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a5b16eeb3540517d08b73d0f52a6389e hcfpcimodem-1.06.ebuild 1778
 MD5 ec2ba46ee258d3cf69ab093034baa705 hcfpcimodem-1.06-r1.ebuild 1905
 MD5 447fbc0590fb83b73a4f82da4e83fc58 ChangeLog 3358
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 2a1608c2f87e5de11a3a9fced0aeaee0 hcfpcimodem-1.08.ebuild 1860
 MD5 25fc41dea981da0f005db63a43768868 files/digest-hcfpcimodem-1.06-r1 144
 MD5 25fc41dea981da0f005db63a43768868 files/digest-hcfpcimodem-1.06 144
+MD5 395bd74ffc3553d4ef151865b7601bb1 files/digest-hcfpcimodem-1.08 144
+MD5 9ec542df181d86f49f4d66377de83a59 files/hcfpcimodem-1.08-upstream-20051215.patch 2777
 MD5 790c0fbf3202d068fbb35b11296985c2 files/hcfpcimodem-1.06-simple_class.patch 5124
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK93GNSP4Vda7IdsRAlxlAJ42CPrRXyTpeovMe4Ja942MKZJgsACgh46a
-us/tLCRwoDGxj1Rgd3hcZqE=
-=yrgz
------END PGP SIGNATURE-----
diff --git a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.08 b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.08
new file mode 100644
index 000000000000..91a47adf1a9d
--- /dev/null
+++ b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.08
@@ -0,0 +1,2 @@
+MD5 6739e411d980ce10cb5ddefe20763660 hcfpcimodem-1.08full.tar.gz 670071
+MD5 e6d8fea8f5f641d7bb4dfb33c6f478e7 100498D_RM_HxF_Released.pdf 718949
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.08-upstream-20051215.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.08-upstream-20051215.patch
new file mode 100644
index 000000000000..6b1dfef26eb6
--- /dev/null
+++ b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.08-upstream-20051215.patch
@@ -0,0 +1,49 @@
+diff -Nru hcfpcimodem-1.08full.orig/modules/GPL/oscompat.h hcfpcimodem-1.08full/modules/GPL/oscompat.h
+--- hcfpcimodem-1.08full.orig/modules/GPL/oscompat.h	2005-09-18 00:42:03.000000000 +0300
++++ hcfpcimodem-1.08full/modules/GPL/oscompat.h	2005-12-15 01:22:24.163927500 +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 -Nru hcfpcimodem-1.08full.orig/modules/Makefile hcfpcimodem-1.08full/modules/Makefile
+--- hcfpcimodem-1.08full.orig/modules/Makefile	2005-10-21 19:15:04.000000000 +0300
++++ hcfpcimodem-1.08full/modules/Makefile	2005-12-15 01:23:06.498573250 +0200
+@@ -80,8 +80,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' ${REAL_KERNELSRC}/include/linux/serial_core.h 2>/dev/null && echo -DFOUND_UART_REGISTER_PORT)
+ FOUND_TTY_START_STOP := $(shell grep -q 'stop_tx.*tty_stop' ${REAL_KERNELSRC}/include/linux/serial_core.h 2>/dev/null && echo -DFOUND_TTY_START_STOP)
+-
+-CFLAGS+= $(FOUND_CLASS_SIMPLE) $(FOUND_UART_REGISTER_PORT) $(FOUND_TTY_START_STOP)
++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_TTY_START_STOP) $(FOUND_CLASS_DEVICE_PARENT) $(FOUND_REFRIGERATOR)
+ 
+ else
+ KO= o
+diff -Nru hcfpcimodem-1.08full.orig/modules/osservices.c hcfpcimodem-1.08full/modules/osservices.c
+--- hcfpcimodem-1.08full.orig/modules/osservices.c	2005-09-11 08:29:12.000000000 +0300
++++ hcfpcimodem-1.08full/modules/osservices.c	2005-12-15 01:22:28.508199000 +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/hcfpcimodem/hcfpcimodem-1.06-r1.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.06-r1.ebuild
index 80f77ba7a546..ec24725b0d4b 100644
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.06-r1.ebuild
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.06-r1.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/hcfpcimodem/hcfpcimodem-1.06-r1.ebuild,v 1.1 2005/09/17 09:11:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.06-r1.ebuild,v 1.2 2005/12/14 23:29:56 mrness Exp $
 
 inherit eutils linux-info
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.linuxant.com/drivers/hcf/full/archive/${P}full/${P}full.tar.
 
 LICENSE="Conexant"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/net-dialup/hcfpcimodem/hcfpcimodem-1.08.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.08.ebuild
new file mode 100644
index 000000000000..30035bca6390
--- /dev/null
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.08.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.08.ebuild,v 1.1 2005/12/14 23:29:56 mrness Exp $
+
+inherit eutils
+
+#The document is the same as in hsfmodem, even if it has a different URL
+MY_DOC="100498D_RM_HxF_Released.pdf"
+
+DESCRIPTION="Linuxant's modem driver for Connexant HCF chipset"
+HOMEPAGE="http://www.linuxant.com/drivers/hcf/index.php"
+SRC_URI="http://www.linuxant.com/drivers/hcf/full/archive/${P}full/${P}full.tar.gz
+	doc? ( http://www.linuxant.com/drivers/hcf/full/archive/${P}full/${MY_DOC} )"
+
+LICENSE="Conexant"
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="doc"
+
+DEPEND="virtual/libc
+	dev-lang/perl
+	app-arch/cpio"
+
+S=${WORKDIR}/${P}full
+
+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
+		eerror
+		eerror "Module is in use by the kernel!!!"
+		eerror "Attempting to unload..."
+		eerror
+
+		# Unloading module...
+		${MOD_N}stop
+		if [ "`lsmod | sed '/^'$MOD_N'serial/!d'`" ]; then
+			eerror "Failed to unload modules from kernel!!!"
+			eerror "Please manualy remove the module from the kernel and emerge again."
+			eerror
+			die
+		fi
+		einfo "Successfuly removed module from memory.  Resuming emerge."
+		einfo
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-upstream-20051215.patch
+}
+
+src_compile() {
+	emake all || die
+}
+
+pkg_preinst() {
+	local NVMDIR=/etc/${PN}/nvm
+	if [ -d "${NVMDIR}" ]; then
+		einfo "Cleaning ${NVMDIR}..."
+		rm -rf /etc/${NVMDIR}
+		eend
+	fi
+}
+
+src_install () {
+	make PREFIX=${D}/usr/ ROOT=${D} install || die
+
+	use doc && dodoc "${DISTDIR}/${MY_DOC}"
+}
+
+pkg_postinst() {
+	einfo "To complete the installation and configuration of your HCF modem,"
+	einfo "please run hcfpciconfig."
+}
+