Version bump.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 135 insertions, 5 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index 3f64eee4bb9f..f769eac7d6f6 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/hcfpcimodem
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.43 2009/09/22 16:34:51 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.44 2009/11/29 09:38:39 mrness Exp $
+
+*hcfpcimodem-1.20 (29 Nov 2009)
+
+  29 Nov 2009; Alin Năstac <mrness@gentoo.org> +hcfpcimodem-1.20.ebuild,
+  +files/hcfpcimodem-1.20-gentoo.patch:
+  Version bump.
 
   22 Sep 2009; Alin Năstac <mrness@gentoo.org> -hcfpcimodem-1.14-r1.ebuild,
   -files/hcfpcimodem-1.14-implicit-declarations.patch,
diff --git a/net-dialup/hcfpcimodem/Manifest b/net-dialup/hcfpcimodem/Manifest
index e98c2021b5b9..6ed49d18224e 100644
--- a/net-dialup/hcfpcimodem/Manifest
+++ b/net-dialup/hcfpcimodem/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA1
 
 AUX hcfpcimodem-1.19-gentoo.patch 901 RMD160 76d2f6aa93e3176093ba45bcbe009436f3a706c2 SHA1 90305476da50d1e0655296be79b5986ccab21c11 SHA256 afc68439d90a913f409062a13fcad71793f7e987900594522b4b0e28142d4763
+AUX hcfpcimodem-1.20-gentoo.patch 901 RMD160 58449eaa91c3749d9e91d0c851e9dc3910bd16b5 SHA1 8a1601e807efb4fa08b3399e0c3c6692864c35e6 SHA256 5044787a51eeaa8c681d970786b51680059825bbc57f4a7e502dc1f2841e7dbf
 DIST 100498D_RM_HxF_Released.pdf 718949 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a SHA1 519c9b064e734873d67cf9c17d8eb1389a6f4eef SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
 DIST hcfpcimodem-1.19full.tar.gz 688868 RMD160 17124e1d096f9f58cfbe90af1a2fe0ca33d4dad3 SHA1 3cc7e0a3d8b38426fdd7e7121c0576368f02af99 SHA256 ceb1f2126384d21a4fc3d5f1431503cc15c15231bee55acbe402577cd3a70e09
+DIST hcfpcimodem-1.20full.tar.gz 692131 RMD160 5dae4966742a335ed94b467545594817398b2da3 SHA1 4b2bb649a2da358d0016bcd71501fc988c6581b8 SHA256 a245a71d4cc78b4263c0d3321729119f158afeaf67fa6eb81feda27966284dd6
 EBUILD hcfpcimodem-1.19.ebuild 2372 RMD160 1fd44f7e65742bf3c828b7f0337f5e9c4420bb0b SHA1 403089454ec943df8851526cedf9350fd6025c79 SHA256 372a8c751a897300990ecdd82b06ce9a73f5f70cb3f598e4ccdcac7f6483782c
-MISC ChangeLog 8024 RMD160 024ca83d1f91d45c15d58248472dc85ea0b4a5bc SHA1 b1c7c79da134808e9e0c0575980ce63152206b3d SHA256 c09687993b48f611ac969153ed2067634c30b96486d5a339afb24499d78d0aa0
+EBUILD hcfpcimodem-1.20.ebuild 2373 RMD160 f2d41169a7aac25e38782d4ca9e35bffe3f6fa34 SHA1 1aed7a74527ec040c6414abcf0fa6e41e6f354c2 SHA256 10b378979b579d86fb2c2da51e0181b4d2d48d4925cdf2d130d3ef103a94d9dd
+MISC ChangeLog 8188 RMD160 909e2c51cad881df7bba6ee952198cb9dca56fba SHA1 030a4f82e9560ccb3f67afc46b0a8b44bdb29a8f SHA256 517f4b110a0b83631b6eadebf0807f7c1ee522f616c53e7d2122d99f8e98ee3c
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq4/LoACgkQ9A5kJBGSrssr6ACfZf64ZaAJNGHlGLHyfpZC7rA7
-XtwAn0RjvUzbqO8tSxooQzxP5iksIpV7
-=yE6u
+iEYEARECAAYFAksSQSYACgkQ9A5kJBGSrstAeQCfVYaUd1YqrgnpG3CEiS/WjPQx
+NKUAn0bie/XOfo8/Ddvhp34Oeaw8L6cV
+=LYME
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.20-gentoo.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.20-gentoo.patch
new file mode 100644
index 000000000000..11ce09abfbbc
--- /dev/null
+++ b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.20-gentoo.patch
@@ -0,0 +1,29 @@
+diff -Nru hcfpcimodem-1.20full.orig/diag/makefile hcfpcimodem-1.20full/diag/makefile
+--- hcfpcimodem-1.20full.orig/diag/makefile	2004-12-14 08:50:41.000000000 +0100
++++ hcfpcimodem-1.20full/diag/makefile	2009-11-29 10:35:05.000000000 +0100
+@@ -10,7 +10,7 @@
+ include $(TOP)/config.mak
+ -include $(TOP)/modules/imported/makeflags.mak
+ 
+-CFLAGS =	-I$(TOP)/modules/imported/include -I$(TOP)/modules/include
++CFLAGS +=	-I$(TOP)/modules/imported/include -I$(TOP)/modules/include
+ CFLAGS +=	$(IMPORTED_FRAMEWORK_DEFS) $(IMPORTED_GENERAL_DEFS)
+ CFLAGS +=	-DCNXTTARGET="\"$(CNXTTARGET)\""
+ 
+@@ -41,13 +41,13 @@
+ 	$(MKDIR) -p $@
+ 
+ $(CNXTTARGET)diag: diag.o modemexpert.o
+-	$(CC) -o $@ $^
++	$(CC) ${LDFLAGS} -o $@ $^
+ 
+ $(CNXTTARGET)scr: scr.o
+-	$(CC) -o $@ $^
++	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^
+ 
+ $(CNXTTARGET)dmp: dmp.o
+-	$(CC) -o $@ $^
++	$(CC) ${CFLAGS} ${LDFLAGS} -o $@ $^
+ 
+ clean:
+ 	rm -f *.o $(ALL)
diff --git a/net-dialup/hcfpcimodem/hcfpcimodem-1.20.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.20.ebuild
new file mode 100644
index 000000000000..ac956686ac78
--- /dev/null
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.20.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.20.ebuild,v 1.1 2009/11/29 09:38:39 mrness 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"
+RDEPEND="${DEPEND}"
+
+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}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.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() {
+	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
+}