rm -rf /etc/hsfmodem/nvm in preinst (no, CONFIG_PROTECT_MASK doesn't remove all folders - prolly gets stucked in some symlinks); stable on x86

(Portage version: 2.0.51.19)

4 files changed, 25 insertions, 17 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index bf36582f5c45..49ac04a1aafc 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.8 2005/03/17 06:35:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.9 2005/03/17 11:30:07 mrness Exp $
+
+*hsfmodem-7.18.00.03-r2 (17 Mar 2005)
+
+  17 Mar 2005; Alin Nastac <mrness@gentoo.org> -hsfmodem-7.18.00.03-r1.ebuild,
+  +hsfmodem-7.18.00.03-r2.ebuild:
+  Fix potential problem by removing /etc/hsfmodem/nvm before packet installation.
+  Stable on x86.
 
 *hsfmodem-7.18.00.03-r1 (16 Mar 2005)
 
diff --git a/net-dialup/hsfmodem/Manifest b/net-dialup/hsfmodem/Manifest
index a150244c2d22..5be18f83becd 100644
--- a/net-dialup/hsfmodem/Manifest
+++ b/net-dialup/hsfmodem/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0795a16ef55f9b7c97e74d31909ebc61 hsfmodem-7.18.00.02.ebuild 1063
-MD5 efc05177457238fb02b04e2303846beb hsfmodem-7.18.00.03-r1.ebuild 1203
 MD5 78ceb4436936ef7f1f118e32c61162c2 ChangeLog 3285
+MD5 0795a16ef55f9b7c97e74d31909ebc61 hsfmodem-7.18.00.02.ebuild 1063
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 31d29dc8b8c0cc6b9e0037de5d0e4269 files/hsfmodem-7.18.00.03-nvminstall.patch 522
-MD5 4523eaa6fcb480127dcf1881e1d2bbad files/digest-hsfmodem-7.18.00.03-r1 158
+MD5 78ae25f789bfb92a8befc59eccc7cb1a hsfmodem-7.18.00.03-r2.ebuild 1304
+MD5 efc05177457238fb02b04e2303846beb hsfmodem-7.18.00.03-r1.ebuild 1203
 MD5 e284b1513d312c30e77623de2a16b405 files/digest-hsfmodem-7.18.00.02 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCOSUqjiC39V7gKu0RAuwLAKCbzqx+KpFBGouau8cqi4XN/qCzVQCeLpWM
-7KwWgWLx/8n+W5u2ZUBwpGA=
-=quUv
------END PGP SIGNATURE-----
+MD5 4523eaa6fcb480127dcf1881e1d2bbad files/digest-hsfmodem-7.18.00.03-r1 158
+MD5 31d29dc8b8c0cc6b9e0037de5d0e4269 files/hsfmodem-7.18.00.03-nvminstall.patch 522
+MD5 4523eaa6fcb480127dcf1881e1d2bbad files/digest-hsfmodem-7.18.00.03-r2 158
diff --git a/net-dialup/hsfmodem/files/digest-hsfmodem-7.18.00.03-r1 b/net-dialup/hsfmodem/files/digest-hsfmodem-7.18.00.03-r2
index 92e95f14a158..92e95f14a158 100644
--- a/net-dialup/hsfmodem/files/digest-hsfmodem-7.18.00.03-r1
+++ b/net-dialup/hsfmodem/files/digest-hsfmodem-7.18.00.03-r2
diff --git a/net-dialup/hsfmodem/hsfmodem-7.18.00.03-r1.ebuild b/net-dialup/hsfmodem/hsfmodem-7.18.00.03-r2.ebuild
index 67105d3dafd1..a33d1ca4d5ee 100644
--- a/net-dialup/hsfmodem/hsfmodem-7.18.00.03-r1.ebuild
+++ b/net-dialup/hsfmodem/hsfmodem-7.18.00.03-r2.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/hsfmodem/hsfmodem-7.18.00.03-r1.ebuild,v 1.2 2005/03/17 06:35:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.18.00.03-r2.ebuild,v 1.1 2005/03/17 11:30:07 mrness Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}fu
 	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )"
 
 LICENSE="Conexant"
-KEYWORDS="-* ~x86 ~amd64"
+KEYWORDS="-* x86 ~amd64"
 IUSE=""
 SLOT="0"
 
@@ -45,6 +45,15 @@ src_install () {
 	make PREFIX=${D}/usr/ ROOT=${D} install || die "make install failed"
 }
 
+pkg_preinst() {
+	local NVMDIR=/etc/${PN}/nvm
+	if [ -d "${NVMDIR}" ]; then
+		einfo "Cleaning ${NVMDIR}..."
+		rm -rf /etc/${NVMDIR}
+		eend
+	fi
+}
+
 pkg_postinst() {
 	einfo "To complete the installation and configuration of your HSF modem,"
 	einfo "please run hsfconfig."