Version bump.

(Portage version: 2.1.4.4)

6 files changed, 23 insertions, 182 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index db4d691daff8..755be164574c 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/hcfpcimodem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.35 2008/01/09 19:09:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.36 2008/04/13 11:06:53 mrness Exp $
+
+*hcfpcimodem-1.15 (13 Apr 2008)
+
+  13 Apr 2008; Alin Năstac <mrness@gentoo.org>
+  -files/hcfpcimodem-1.12-implicit-declarations.patch,
+  -files/hcfpcimodem-1.13-implicit-declarations.patch,
+  -files/hcfpcimodem-1.13-unset-locale.patch, -hcfpcimodem-1.12-r1.ebuild,
+  -hcfpcimodem-1.13-r1.ebuild, +hcfpcimodem-1.15.ebuild:
+  Version bump.
 
 *hcfpcimodem-1.14-r1 (09 Jan 2008)
 
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.12-implicit-declarations.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.12-implicit-declarations.patch
deleted file mode 100644
index c1fc95102cde..000000000000
--- a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.12-implicit-declarations.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nru hcfpcimodem-1.12full.orig/diag/diag.c hcfpcimodem-1.12full/diag/diag.c
---- hcfpcimodem-1.12full.orig/diag/diag.c	2004-12-14 09:50:46.000000000 +0200
-+++ hcfpcimodem-1.12full/diag/diag.c	2007-04-10 03:32:15.000000000 +0300
-@@ -13,6 +13,7 @@
- #include <asm/byteorder.h>
- #include <stdio.h>
- #include <sys/select.h>
-+#include <stdlib.h>
- 
- #include "framewrk.h"
- #include "osservices.h"
-diff -Nru hcfpcimodem-1.12full.orig/diag/modemexpert.c hcfpcimodem-1.12full/diag/modemexpert.c
---- hcfpcimodem-1.12full.orig/diag/modemexpert.c	2004-12-14 09:50:39.000000000 +0200
-+++ hcfpcimodem-1.12full/diag/modemexpert.c	2007-04-10 03:36:16.000000000 +0300
-@@ -13,6 +13,7 @@
- #include <errno.h>
- #include <signal.h>
- #include <sys/queue.h>
-+#include <string.h>
- 
- #include "framewrk.h"
- #include "osservices.h"
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-implicit-declarations.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-implicit-declarations.patch
deleted file mode 100644
index 044d707f1e92..000000000000
--- a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-implicit-declarations.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nru hcfpcimodem-1.13full.orig/diag/diag.c hcfpcimodem-1.13full/diag/diag.c
---- hcfpcimodem-1.13full.orig/diag/diag.c	2004-12-14 09:50:46.000000000 +0200
-+++ hcfpcimodem-1.13full/diag/diag.c	2007-07-14 10:35:38.000000000 +0300
-@@ -13,6 +13,7 @@
- #include <asm/byteorder.h>
- #include <stdio.h>
- #include <sys/select.h>
-+#include <stdlib.h>
- 
- #include "framewrk.h"
- #include "osservices.h"
-diff -Nru hcfpcimodem-1.13full.orig/diag/modemexpert.c hcfpcimodem-1.13full/diag/modemexpert.c
---- hcfpcimodem-1.13full.orig/diag/modemexpert.c	2004-12-14 09:50:39.000000000 +0200
-+++ hcfpcimodem-1.13full/diag/modemexpert.c	2007-07-14 10:35:38.000000000 +0300
-@@ -13,6 +13,7 @@
- #include <errno.h>
- #include <signal.h>
- #include <sys/queue.h>
-+#include <string.h>
- 
- #include "framewrk.h"
- #include "osservices.h"
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-unset-locale.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-unset-locale.patch
deleted file mode 100644
index ae7872a1e207..000000000000
--- a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-unset-locale.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nru hcfpcimodem-1.13full.orig/makefile hcfpcimodem-1.13full/makefile
---- hcfpcimodem-1.13full.orig/makefile	2007-05-10 21:06:08.000000000 +0300
-+++ hcfpcimodem-1.13full/makefile	2007-08-28 21:49:33.000000000 +0300
-@@ -229,7 +229,7 @@
- 		mv debian/changelog.tmp debian/changelog; \
- 		( echo CNXTDRIVER=$(CNXTDRIVER); echo "TARGET_DISTRO=$$d"; echo "TARGET_KERNEL=$$k"; echo "DISTROKERNHDRSDIR=$(DISTROKERNHDRSDIR)"; echo "PACKAGE_NAME=$(@F)"; echo "PACKAGE_ARCH=$(*D)" ) > debian/target.mak; \
- 	fi
--	unset LANG; unset LOCALE; unset LC_TIME; dpkg-buildpackage -a$(IMPORTED_ARCH_DEBIAN) -us -uc || true
-+	unset LANG; unset LOCALE; unset LC_ALL; unset LC_TIME; dpkg-buildpackage -a$(IMPORTED_ARCH_DEBIAN) -us -uc || true
- 	rm -f debian/target.mak
- 	mv ../$(CNXTTARGET)modem_*.deb packages/DEBS/$(*D)/$(@F)
- 	rm -f ../$(CNXTTARGET)modem_* ../$(CNXTTARGET)modem-doc_*
-diff -Nru hcfpcimodem-1.13full.orig/modules/kernelcompiler.sh hcfpcimodem-1.13full/modules/kernelcompiler.sh
---- hcfpcimodem-1.13full.orig/modules/kernelcompiler.sh	2007-04-20 17:30:51.000000000 +0300
-+++ hcfpcimodem-1.13full/modules/kernelcompiler.sh	2007-08-28 21:48:52.000000000 +0300
-@@ -8,7 +8,7 @@
- KERNELVER="$1"
- KERNELSRC="$2"
- 
--unset LANG
-+unset LANG LOCALE LC_ALL
- 
- if [ -n "${RPM_BUILD_ROOT}${DEB_HOST_GNU_SYSTEM}" ]; then
- 	if [ -f "${KERNELSRC}/kernelcompiler" ]; then
-diff -Nru hcfpcimodem-1.13full.orig/scripts/cnxtconfig.in hcfpcimodem-1.13full/scripts/cnxtconfig.in
---- hcfpcimodem-1.13full.orig/scripts/cnxtconfig.in	2007-05-10 21:06:08.000000000 +0300
-+++ hcfpcimodem-1.13full/scripts/cnxtconfig.in	2007-08-28 21:48:52.000000000 +0300
-@@ -2635,7 +2635,7 @@
- 	exit $?
- fi
- 
--unset LANG
-+unset LANG LOCALE LC_ALL
- 
- umask 022
- 
-diff -Nru hcfpcimodem-1.13full.orig/scripts/patcher.in hcfpcimodem-1.13full/scripts/patcher.in
---- hcfpcimodem-1.13full.orig/scripts/patcher.in	2005-12-08 05:33:35.000000000 +0200
-+++ hcfpcimodem-1.13full/scripts/patcher.in	2007-08-28 21:48:52.000000000 +0300
-@@ -285,8 +285,7 @@
- # Safe environment...
- PATH=/usr/sbin:/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin
- export PATH
--unset LANG
--unset LOCALE
-+unset LANG LOCALE LC_ALL
- umask 022
- 
- if check_tools gawk; then
diff --git a/net-dialup/hcfpcimodem/hcfpcimodem-1.12-r1.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.12-r1.ebuild
deleted file mode 100644
index c01cae260750..000000000000
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.12-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.12-r1.ebuild,v 1.3 2007/07/15 04:52:33 mr_bones_ Exp $
-
-inherit eutils linux-info
-
-#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="dev-lang/perl
-	app-arch/cpio"
-
-S="${WORKDIR}/${P}full"
-
-QA_EXECSTACK="usr/lib/hcfpcimodem/modules/imported/hcfblam-i386.O usr/lib/hcfpcimodem/modules/imported/hcfengine-i386.O"
-
-pkg_setup() {
-	linux-info_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}-implicit-declarations.patch"
-}
-
-src_compile() {
-	emake all || die "make failed"
-}
-
-pkg_preinst() {
-	local NVMDIR="${ROOT}/etc/${PN}/nvm"
-	if [ -d "${NVMDIR}" ]; then
-		einfo "Cleaning ${NVMDIR}..."
-		rm -rf "${NVMDIR}"
-		eend
-	fi
-}
-
-src_install () {
-	make PREFIX="${D}/usr/" ROOT="${D}" install || die "make install failed"
-
-	# in some cases, kernelcompiler.sh does not have x permission (#173414)
-	fperms a+rx /usr/lib/hcfpcimodem/modules/kernelcompiler.sh
-
-	use doc && dodoc "${DISTDIR}/${MY_DOC}"
-}
-
-pkg_postinst() {
-	elog "To complete the installation and configuration of your HCF modem,"
-	elog "please run hcfpciconfig."
-}
diff --git a/net-dialup/hcfpcimodem/hcfpcimodem-1.13-r1.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.15.ebuild
index 7d69aa44f5b6..61a155a17675 100644
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.13-r1.ebuild
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.13-r1.ebuild,v 1.1 2007/08/28 18:53:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.15.ebuild,v 1.1 2008/04/13 11:06:53 mrness Exp $
 
 inherit eutils linux-info
 
@@ -51,8 +51,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}/${P}-implicit-declarations.patch"
-	epatch "${FILESDIR}/${P}-unset-locale.patch"
+	#epatch "${FILESDIR}/${P}-implicit-declarations.patch"
 }
 
 src_compile() {
@@ -78,6 +77,14 @@ src_install () {
 }
 
 pkg_postinst() {
-	elog "To complete the installation and configuration of your HCF modem,"
-	elog "please run hcfpciconfig."
+	if [ "${ROOT}" = / ]; then
+		elog "To complete the installation and configuration of your HCF modem,"
+		elog "please run hcfpciconfig."
+	fi
+}
+
+pkg_prerm() {
+	if [ "${ROOT}" = / -a -f /etc/init.d/hcfpci ] ; then
+		hcfpciconfig --remove || die "hcfpciconfig --remove failed"
+	fi
 }