Version bump.

Package-Manager: portage-2.1.4.5

5 files changed, 139 insertions, 11 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index 00c340f84f38..26dc67023786 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,12 @@
 # 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.39 2008/10/18 07:48:20 mrness Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.40 2009/01/12 22:32:02 mrness Exp $
+
+*hcfpcimodem-1.18 (12 Jan 2009)
+
+  12 Jan 2009; Alin Năstac <mrness@gentoo.org>
+  +files/hcfpcimodem-1.18-gentoo.patch, +hcfpcimodem-1.18.ebuild:
+  Version bump.
 
 *hcfpcimodem-1.17-r1 (18 Oct 2008)
 
diff --git a/net-dialup/hcfpcimodem/Manifest b/net-dialup/hcfpcimodem/Manifest
index 87720ab9c484..061e632656c9 100644
--- a/net-dialup/hcfpcimodem/Manifest
+++ b/net-dialup/hcfpcimodem/Manifest
@@ -3,22 +3,25 @@ Hash: SHA1
 
 AUX hcfpcimodem-1.14-implicit-declarations.patch 808 RMD160 18d90e6166baa9272cdf84c1319548c0491f1225 SHA1 7cb281ce81ebb59b152a158b99bcad92c3a708f0 SHA256 b3dafa2a66d87b0e3a050a17eded5fdd642a9e169080a55d15f06abd36d0c731
 AUX hcfpcimodem-1.17-gentoo.patch 901 RMD160 701a532f3cdfe2a08a49c58d77234d7ce7e12700 SHA1 865b30339e378a00815607489e79ddaa74110c26 SHA256 4b2580949cb3adcad72f9db7948821970ab397e5b44943b38a51f4fc6bcbb6f3
+AUX hcfpcimodem-1.18-gentoo.patch 901 RMD160 c52e28c96da8c6b94f0fef92cb8fde499e793c9c SHA1 cd8cb5e6009b9990b5413ad74815b8178679f947 SHA256 4cc291db3380a3b4e19549f3c36d4de2b442dec1273a0f9a14f4b7ed8f2cfd43
 DIST 100498D_RM_HxF_Released.pdf 718949 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a SHA1 519c9b064e734873d67cf9c17d8eb1389a6f4eef SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
 DIST hcfpcimodem-1.14full.tar.gz 680841 RMD160 3775efc04a2affe1607b23ca72cc5d2a6dca8a1d SHA1 2f0421d8c8a79d2daaaacae5072fa83eaa373eea SHA256 341e51827b825a2ef9b1d1a1c7cadac3ede337f5f1ba5949bd26830122d06c8e
 DIST hcfpcimodem-1.15full.tar.gz 682094 RMD160 8b92ab8a7d446d65c521deaa001999105eee3d33 SHA1 ff0d9e65ddef8b3f59f7b12e6ac02093dc7b2e5b SHA256 3901f684d6e11a406ff2bf698735607da13b9ead4d713bbe89ce4b612eb9f3ac
 DIST hcfpcimodem-1.16full.tar.gz 682777 RMD160 95e2f64994879877020e84b260b90bea6079fe52 SHA1 78198b870ba1e42ca13168c4a896161f4e0451ac SHA256 c497d6d0fcf3409e9cc2db67c978b253a9350480cd54d3cf736d5cc82d5c917c
 DIST hcfpcimodem-1.17full.tar.gz 688552 RMD160 81cadfd837f0c0ff8cf570c764acd7d1b43f9f20 SHA1 83621e80dd6387695b3f76920c84b49de8b44e0c SHA256 c7af1b344ecdaeaf9467585f56a7ab0ed9105b685e58ecc893d3fc54b436e1cc
+DIST hcfpcimodem-1.18full.tar.gz 687857 RMD160 637a163c65468374510c324ffe27dca91523a71f SHA1 1f012e520f435c284f45a830120f3c17a3926b9f SHA256 dca291873477c0d095691984751f1295bba0d23b0c90f7d396d6f26ed5a6035c
 EBUILD hcfpcimodem-1.14-r1.ebuild 2359 RMD160 318d5f95d9ff79fad19c431bf30ab37692d910b7 SHA1 49e2570018f80067d6f14ee7c5e18e33d9c7546c SHA256 171d377863c52b60762919417402b72cbcc25c653279e37923dc1bd078eec5e3
 EBUILD hcfpcimodem-1.15.ebuild 2270 RMD160 226806aaff83bddaa5c359d18f5bfc465b31ceb6 SHA1 9c868d33688703b3e8bddec7adce8a55a5aaae3c SHA256 171b98eb010969aa6b5d6d322436bf388cc296dd190f195c01ff2e6f22a331c6
 EBUILD hcfpcimodem-1.16.ebuild 2270 RMD160 c933e8eae7c812ac6dc3690f2bf6ede4bb5bc955 SHA1 7ea4817e73d4f2d56a32800d171941c26416a518 SHA256 1926e1f1308701202f8c8ec5bd4b36afa4a19d870b36445fa970966508f33b1b
 EBUILD hcfpcimodem-1.17-r1.ebuild 2356 RMD160 cfd8ff1f219a4f7ad8624a445b946ef8c71a92f7 SHA1 0c95860b29625d0c999c572bb33b18f95de2c0c2 SHA256 7ae8b6ef06e1eef5645e9e8967a2704df57e23c02e719acb304db5f9497f19d1
 EBUILD hcfpcimodem-1.17.ebuild 2270 RMD160 7c2d4a4dbe91584d40c77367109ebfbe13e711d1 SHA1 647949f66131d5147fca017dee5ab2ca9d7c333c SHA256 3a9c8d95beea7a38f6476136053875fc01155e9a61ccfe11a009573813b47b46
-MISC ChangeLog 7218 RMD160 60fc405697906547e84b1ccf548aef184179d08c SHA1 625eebe1a6a6abab1ec8b95107dc8394128c37f1 SHA256 2a06089bf010226f42cba33d3804e68eb6e2dbb7bca9aaf4757c05150d537724
+EBUILD hcfpcimodem-1.18.ebuild 2353 RMD160 e476f9be33b3e09cee261d8394d44d4fab1ead08 SHA1 4780bfab78ba6aa7c108d4615d55fa3c9f435d0d SHA256 5f105d73db1c012a451acf28a2dec40e9fcfa9f207d7a201c33f72cbeab3d629
+MISC ChangeLog 7382 RMD160 ff16e12860e6ae7c73207268f4b4d1ea2f062da8 SHA1 59a2e5c4ca00c760045b5b904275c49b0e8ead88 SHA256 5e2a04eee3f6f0d99349c2bbe847f15e49f0c365868d05d2acbe4c7eee31836d
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj5lM4ACgkQPrHvTlXvhtv0hACfXSxb50pI51v/U1wpBLiu282l
-beIAmwRptg0Gw5bqs+g0CoYDfgEiHb4A
-=oO0r
+iEYEARECAAYFAklrxOkACgkQts85UDFmaOVTJQCfasJA1/csrcib0qkDDd8I8HdT
+2LkAnjenAxV1UaefpsRqtgNzgtLz7apx
+=dN+S
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.18-gentoo.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.18-gentoo.patch
new file mode 100644
index 000000000000..91a17314e976
--- /dev/null
+++ b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.18-gentoo.patch
@@ -0,0 +1,29 @@
+diff -Nru hcfpcimodem-1.18full.orig/diag/makefile hcfpcimodem-1.18full/diag/makefile
+--- hcfpcimodem-1.18full.orig/diag/makefile	2004-12-14 07:50:41.000000000 +0000
++++ hcfpcimodem-1.18full/diag/makefile	2009-01-12 22:29:02.000000000 +0000
+@@ -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.18.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.18.ebuild
new file mode 100644
index 000000000000..4289e5212075
--- /dev/null
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.18.ebuild
@@ -0,0 +1,91 @@
+# 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.18.ebuild,v 1.1 2009/01/12 22:32:02 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"
+
+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
+}
diff --git a/net-dialup/hcfusbmodem/Manifest b/net-dialup/hcfusbmodem/Manifest
index f4c6f5fb4dd5..5a29bf0803d1 100644
--- a/net-dialup/hcfusbmodem/Manifest
+++ b/net-dialup/hcfusbmodem/Manifest
@@ -4,13 +4,12 @@ Hash: SHA1
 AUX hcfusbmodem-1.15-gentoo.patch 928 RMD160 8d1a1064b49306571bfcbf3b5170962a6658a040 SHA1 e929a3734a74d5f1a3f2ea7a65a0bd10afe059b9 SHA256 6bfb535d6b10080ea8695cc84ca44e7223aca1649dbebb7be4cd0ed4eb0dbc37
 DIST hcfusbmodem-1.15powerpcfull.tar.gz 615733 RMD160 f3018d276bc15ccca16712c60e6c20a5e758c951 SHA1 cd079e37c7d3b09b9414ac78a18a0b784814b90d SHA256 102111270f8d1bad60170d438cb510399998ef700333aa43d2db8cacd828fcc4
 EBUILD hcfusbmodem-1.15-r1.ebuild 1233 RMD160 6512b8d8150ab77ac94ce4e80bab0a2a7c652aff SHA1 483c5612ddf6dcb39d5016367606e605216a7ac2 SHA256 02ec6e777cceba9dc4b81d074c952483cc2b22cca8333f8d6b12356d15b977e8
-EBUILD hcfusbmodem-1.15.ebuild 1147 RMD160 173da30884eb426593b89e41fc2b82ec8d4d9924 SHA1 aa2befdf29739942dd2099fb2bab185dbef6031e SHA256 743a903bf090e21418b013f1965729b4a5aa4c8bb907e868897ca91a85d37d33
-MISC ChangeLog 4483 RMD160 bc9612879ebca1bb0e8699c629c2634e2a287c26 SHA1 b111d695aa40a83795458676472e99acf8ec918b SHA256 613586a5e0d4e59faf48904d966d8e768a27d7700baa703b6f48c6634b4b42db
+MISC ChangeLog 4584 RMD160 6fe8331573dbbabd8d622fb382f10805f89dfafb SHA1 1a8cfff978694a1d7b398132aa4b20df2c69d030 SHA256 c4bf54c10eb627437cf823c54f26ad63c06b7ce7fb5521a433a3ccce98ff18c7
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj5lrEACgkQPrHvTlXvhtsIGwCfdrf8RXIMeaONJtB9xq7z2Z/A
-8XwAn0eLzlBL2eKS6ivc32OfISxfq3nd
-=vu/P
+iEYEARECAAYFAklrxU0ACgkQts85UDFmaOX2/QCfel8ilZyf2uw43uPhmYtPXF0T
+kSIAnj5k31PGYmbN7rFLf+xKsmAGu8t6
+=b2cJ
 -----END PGP SIGNATURE-----