Version bump.

Package-Manager: portage-2.1.4.4

7 files changed, 36 insertions, 190 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/Manifest b/net-dialup/hcfpcimodem/Manifest
index 2cb1a45b4d24..258298f880cd 100644
--- a/net-dialup/hcfpcimodem/Manifest
+++ b/net-dialup/hcfpcimodem/Manifest
@@ -1,13 +1,18 @@
-AUX hcfpcimodem-1.12-implicit-declarations.patch 808 RMD160 49b81112cc4823347c2a14758fb2f0688eb85ee7 SHA1 7f68778461cb3850faa80d11512ef24b24caa6f8 SHA256 185317fa5e54b810a7ee215e318046402eb9e2e4b965820d6f3b3f421d867de0
-AUX hcfpcimodem-1.13-implicit-declarations.patch 808 RMD160 1c04778659a2101c93aa18b50dcb7d5b1bb7231e SHA1 43f8a29e59bf37623dc4ab6792774f6ac24da49c SHA256 f5d031e82365456170bbe0a84d1b97a0714f447ec78d605202947694941cd662
-AUX hcfpcimodem-1.13-unset-locale.patch 2193 RMD160 c74b6f162b1798ede9f4aac18f42fcb815664afc SHA1 1ff328d1f24e2ef5e13b77c24b720471eebcb29b SHA256 b2a600d2b20531406e39d87d069dbd6b168696f9a3faf54865a61301ecbd8a3c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hcfpcimodem-1.14-implicit-declarations.patch 808 RMD160 18d90e6166baa9272cdf84c1319548c0491f1225 SHA1 7cb281ce81ebb59b152a158b99bcad92c3a708f0 SHA256 b3dafa2a66d87b0e3a050a17eded5fdd642a9e169080a55d15f06abd36d0c731
 DIST 100498D_RM_HxF_Released.pdf 718949 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a SHA1 519c9b064e734873d67cf9c17d8eb1389a6f4eef SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
-DIST hcfpcimodem-1.12full.tar.gz 677933 RMD160 debdd7fd6b4fc446897431a9643c7e6750a1295e SHA1 50216968cdf16d39d6277c4ef59c25df96b5461b SHA256 7ec8c42c22db367ef9060f4e7cdf2a7d0c79e009b00ec74fd3f545e9dd3dea89
-DIST hcfpcimodem-1.13full.tar.gz 679289 RMD160 8c816c67e568887988b3d18d04f1cbc21c5b445f SHA1 42deb9c6626749bf065bce9fc9e99bad803814d1 SHA256 9be275eb0614040ae726dd9d5d479c5ed53106538b73d486dbccece5a0a0bd48
 DIST hcfpcimodem-1.14full.tar.gz 680841 RMD160 3775efc04a2affe1607b23ca72cc5d2a6dca8a1d SHA1 2f0421d8c8a79d2daaaacae5072fa83eaa373eea SHA256 341e51827b825a2ef9b1d1a1c7cadac3ede337f5f1ba5949bd26830122d06c8e
-EBUILD hcfpcimodem-1.12-r1.ebuild 2191 RMD160 01082d51d43090120d830af1f80463212c16b96e SHA1 0225da750f4bbba3b055dd4f3e5396201cbfdc4c SHA256 afa0ccea3f2ada6781d0e698d107f551f1804def286d50ed8902dcf5c14329f5
-EBUILD hcfpcimodem-1.13-r1.ebuild 2235 RMD160 681a7b71146de52ea7353ea6062114541a6ef2ba SHA1 3dc20403cca72d8226937566e03ad968fdee7923 SHA256 fe8625209245099d17dac6a4f4cfb20e913734f3ff3bb641fe87133c162e9733
+DIST hcfpcimodem-1.15full.tar.gz 682094 RMD160 8b92ab8a7d446d65c521deaa001999105eee3d33 SHA1 ff0d9e65ddef8b3f59f7b12e6ac02093dc7b2e5b SHA256 3901f684d6e11a406ff2bf698735607da13b9ead4d713bbe89ce4b612eb9f3ac
 EBUILD hcfpcimodem-1.14-r1.ebuild 2359 RMD160 318d5f95d9ff79fad19c431bf30ab37692d910b7 SHA1 49e2570018f80067d6f14ee7c5e18e33d9c7546c SHA256 171d377863c52b60762919417402b72cbcc25c653279e37923dc1bd078eec5e3
-MISC ChangeLog 6411 RMD160 47c834e380374065a74190aed3fe317db808e643 SHA1 97008ce514dcc7c4f82db77fbb88c83bdf34b76b SHA256 3ea6d3579255ee711e972763b49f2bf3a2179997ad226b269c61eafb96226c10
+EBUILD hcfpcimodem-1.15.ebuild 2358 RMD160 822aea76034ff78ade03e43675315c2874abe6a7 SHA1 074818d9c261fa7b64d77c84a878f1e7ba30d615 SHA256 74df681dc887bd4d9f909545de951469651b6f8a56e3c061baab754a0bbe6710
+MISC ChangeLog 6751 RMD160 48a93f31e8445565a88bb485c06ac152ffb8f609 SHA1 a8da1912ee317563aba3c8c1d3acbe9912a1d764 SHA256 48e513b577f14f0b9f53c129bab3d79d980e162113af4d651cc1765fca4c14e6
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIAelX+fWpoTWIA9ERAgELAJ0XK32GbgZf4cYxe7iLhSBOFv4d7gCcDHEH
+C5UQf8a+WeWjlDJ6DDYwNfw=
+=lL/2
+-----END PGP SIGNATURE-----
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
 }