fix missing region files; remove /etc/hcfpcimodem/nvm in preinst (CONFIG_PROTECT_MASK may not delete all dirs)

Package-Manager: portage-2.0.51.19

5 files changed, 68 insertions, 27 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index ae529989ad92..c35c328ecc57 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,14 @@
 # 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.14 2005/03/06 00:29:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.15 2005/03/17 12:05:12 mrness Exp $
+
+*hcfpcimodem-1.05-r1 (17 Mar 2005)
+
+  17 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/hcfpcimodem-1.05-nvminstall.patch, +hcfpcimodem-1.05-r1.ebuild,
+  -hcfpcimodem-1.05.ebuild:
+  Fix missing region files (#84927). Remove /etc/hcfpcimodem/nvm before packet
+  installation.
 
 *hcfpcimodem-1.05 (06 Mar 2005)
 
diff --git a/net-dialup/hcfpcimodem/Manifest b/net-dialup/hcfpcimodem/Manifest
index 1d7b49116180..22f9288be382 100644
--- a/net-dialup/hcfpcimodem/Manifest
+++ b/net-dialup/hcfpcimodem/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 536382ed9365dfadd47ecba3af2e2199 hcfpcimodem-1.05.ebuild 1354
-MD5 288c2e93216447e8558858da7ba71952 ChangeLog 2333
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 6a25a0f5c825925187ac3b60c5831213 ChangeLog 2613
 MD5 f99eb903f5c3e0b1e95bfd9055c6cf75 hcfpcimodem-1.03.ebuild 1353
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 7132c8bf3a59dc720cf8ceee6f4b5ad8 hcfpcimodem-1.05-r1.ebuild 1631
 MD5 13b1736e40486ab28af3387842521d86 files/digest-hcfpcimodem-1.03 72
-MD5 c5a95c807346bdb475dcf710e9ff1fd2 files/digest-hcfpcimodem-1.05 72
+MD5 d456c8abc9d9cb81d489465d053395ab files/hcfpcimodem-1.05-nvminstall.patch 497
+MD5 c5a95c807346bdb475dcf710e9ff1fd2 files/digest-hcfpcimodem-1.05-r1 72
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCKk7rjiC39V7gKu0RAu7fAKDCrPNfTIk92Vqg0BeRMpiD5miJIQCgrmxF
-1pJq7fWVfvwHtRtVd9JFLKM=
-=Ns/N
+iD8DBQFCOXKJjiC39V7gKu0RAnk1AKCkrYNB4/H083+zI5N9kJiwpVwKWgCfWPvn
+ES1hhzB5N27FnEnGFKpO/CY=
+=wS4e
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.05 b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.05-r1
index b0a25e559c79..b0a25e559c79 100644
--- a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.05
+++ b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.05-r1
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.05-nvminstall.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.05-nvminstall.patch
new file mode 100644
index 000000000000..ae0d4c86b2c6
--- /dev/null
+++ b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.05-nvminstall.patch
@@ -0,0 +1,12 @@
+diff -Nru hcfpcimodem-1.05full.orig/nvm/makefile hcfpcimodem-1.05full/nvm/makefile
+--- hcfpcimodem-1.05full.orig/nvm/makefile	2004-12-14 09:51:07.000000000 +0200
++++ hcfpcimodem-1.05full/nvm/makefile	2005-03-17 13:40:01.689242088 +0200
+@@ -68,7 +68,7 @@
+ 	touch $(NVMCVTDIR)/.linksame
+ 
+ install: all $(CNXTNVMDIR)
+-	cd $(NVMCVTDIR) && (find $(patsubst %, $(CNXTTARGET)%, $(NVMDIRS)) | cpio -pdmu $(CNXTNVMDIR))
++	cp -a $(NVMCVTDIR)/* $(CNXTNVMDIR)
+ 
+ $(NVMCVTDIR) $(CNXTNVMDIR):
+ 	$(MKDIR) -p $@
diff --git a/net-dialup/hcfpcimodem/hcfpcimodem-1.05.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.05-r1.ebuild
index e16291342694..1e01c59f2b1f 100644
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.05.ebuild
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.05-r1.ebuild
@@ -1,6 +1,8 @@
 # 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.05.ebuild,v 1.1 2005/03/06 00:29:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.05-r1.ebuild,v 1.1 2005/03/17 12:05:12 mrness Exp $
+
+inherit eutils
 
 DESCRIPTION="Linuxant's modem driver for Connexant HCF chipset"
 HOMEPAGE="http://www.linuxant.com/drivers/hcf/index.php"
@@ -10,28 +12,17 @@ LICENSE="Conexant"
 SLOT="0"
 KEYWORDS="-* ~x86"
 IUSE=""
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${P}full
 
-src_compile() {
-	emake all || die
-}
-
-src_install () {
-	make PREFIX=${D}/usr/ ROOT=${D} install || die
-}
+DEPEND="virtual/libc
+	dev-lang/perl
+	app-arch/cpio"
 
-pkg_postinst() {
-	einfo "To complete the installation and configuration of your HCF modem,"
-	einfo "please run hcfpciconfig."
-}
+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
+	if [ "`lsmod | sed '/^'$MOD_N'serial/!d'`" ]; then
 		eerror
 		eerror "Module is in use by the kernel!!!"
 		eerror "Attempting to unload..."
@@ -39,8 +30,7 @@ pkg_setup () {
 
 		# Unloading module...
 		${MOD_N}stop
-		if [ "`lsmod | sed '/^'$MOD_N'serial/!d'`" ]
-		then
+		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
@@ -50,3 +40,33 @@ pkg_setup () {
 		einfo
 	fi
 }
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-nvminstall.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
+}
+
+pkg_postinst() {
+	einfo "To complete the installation and configuration of your HCF modem,"
+	einfo "please run hcfpciconfig."
+}
+