Remove obsolete versions. Version bump.

(Portage version: 2.1.2.7)

9 files changed, 41 insertions, 196 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index 491c4bd37b0f..93f18c3a90d9 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/hcfpcimodem
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.30 2007/05/02 08:03:27 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.31 2007/07/14 07:41:55 mrness Exp $
+
+*hcfpcimodem-1.13 (14 Jul 2007)
+
+  14 Jul 2007; Alin Năstac <mrness@gentoo.org>
+  -files/hcfpcimodem-1.10-suspend2.patch,
+  +files/hcfpcimodem-1.13-implicit-declarations.patch,
+  -hcfpcimodem-1.10-r2.ebuild, -hcfpcimodem-1.11.ebuild,
+  -hcfpcimodem-1.12.ebuild, +hcfpcimodem-1.13.ebuild:
+  Remove obsolete versions. Version bump.
 
   02 May 2007; Marius Mauch <genone@gentoo.org> hcfpcimodem-1.10-r2.ebuild,
   hcfpcimodem-1.11.ebuild, hcfpcimodem-1.12.ebuild,
diff --git a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.11 b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.11
deleted file mode 100644
index 7992acbf0db7..000000000000
--- a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.11
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e6d8fea8f5f641d7bb4dfb33c6f478e7 100498D_RM_HxF_Released.pdf 718949
-RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a 100498D_RM_HxF_Released.pdf 718949
-SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1 100498D_RM_HxF_Released.pdf 718949
-MD5 6bb1a6ea10bbf8d971222104071f8291 hcfpcimodem-1.11full.tar.gz 677772
-RMD160 b1cc280c6511176c215b33124098072f7449eb5d hcfpcimodem-1.11full.tar.gz 677772
-SHA256 a1c8f8a2d6818d3f1c2da0372383be0e68c887b610f3f8135f640e136dc3e0fe hcfpcimodem-1.11full.tar.gz 677772
diff --git a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.12 b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.12
deleted file mode 100644
index 00953ad038fd..000000000000
--- a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.12
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e6d8fea8f5f641d7bb4dfb33c6f478e7 100498D_RM_HxF_Released.pdf 718949
-RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a 100498D_RM_HxF_Released.pdf 718949
-SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1 100498D_RM_HxF_Released.pdf 718949
-MD5 a50e38e11545ade89b5ec109e610bc85 hcfpcimodem-1.12full.tar.gz 677933
-RMD160 debdd7fd6b4fc446897431a9643c7e6750a1295e hcfpcimodem-1.12full.tar.gz 677933
-SHA256 7ec8c42c22db367ef9060f4e7cdf2a7d0c79e009b00ec74fd3f545e9dd3dea89 hcfpcimodem-1.12full.tar.gz 677933
diff --git a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10-r2 b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.13
index ba1df2bb09f8..0cf652461e2b 100644
--- a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.10-r2
+++ b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.13
@@ -1,6 +1,6 @@
 MD5 e6d8fea8f5f641d7bb4dfb33c6f478e7 100498D_RM_HxF_Released.pdf 718949
 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a 100498D_RM_HxF_Released.pdf 718949
 SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1 100498D_RM_HxF_Released.pdf 718949
-MD5 77ae9265f37798bb9e359eb2aeb5f1da hcfpcimodem-1.10full.tar.gz 673764
-RMD160 b034f6595eaf45adcfe47803ad99097c8e056ca1 hcfpcimodem-1.10full.tar.gz 673764
-SHA256 007f24b11e4ae2723f4a2b29172ec80f1d3d0bd86436769f471172fbf7af4556 hcfpcimodem-1.10full.tar.gz 673764
+MD5 8599518458de7eb4ad352cb608523ca9 hcfpcimodem-1.13full.tar.gz 679289
+RMD160 8c816c67e568887988b3d18d04f1cbc21c5b445f hcfpcimodem-1.13full.tar.gz 679289
+SHA256 9be275eb0614040ae726dd9d5d479c5ed53106538b73d486dbccece5a0a0bd48 hcfpcimodem-1.13full.tar.gz 679289
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.10-suspend2.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.10-suspend2.patch
deleted file mode 100644
index 95b545e77a82..000000000000
--- a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.10-suspend2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN hcfpcimodem-1.10full/modules/osservices.c hcfpcimodem-1.10full-suspend2/modules/osservices.c
---- hcfpcimodem-1.10full/modules/osservices.c	2006-02-08 01:27:25.000000000 -0500
-+++ hcfpcimodem-1.10full-suspend2/modules/osservices.c	2006-03-06 14:40:19.000000000 -0500
-@@ -28,9 +28,22 @@
- #include <linux/smp_lock.h>
- #include <linux/file.h>
- #include <linux/kmod.h>
-+
- #ifdef FOUND_LINUX_SUSPEND
-+#define UINT8 UINT8_suspend
-+#define BOOL BOOL_suspend
-+#define UINT16 UINT16_suspend
-+#define UINT32 UINT32_suspend
-+#define INT32 INT32_suspend
-+#undef INT64
- #include <linux/suspend.h>
--#endif
-+#undef UINT8
-+#undef BOOL
-+#undef UINT16
-+#undef UINT32
-+#undef INT32
-+#endif /* FOUND_LINUX_SUSPEND */
-+
- #if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,7) )
- #include <linux/completion.h>
- #endif
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-implicit-declarations.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-implicit-declarations.patch
new file mode 100644
index 000000000000..044d707f1e92
--- /dev/null
+++ b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-implicit-declarations.patch
@@ -0,0 +1,22 @@
+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/hcfpcimodem-1.11.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.11.ebuild
deleted file mode 100644
index 69b69154f605..000000000000
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.11.ebuild
+++ /dev/null
@@ -1,74 +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.11.ebuild,v 1.2 2007/05/02 08:03:27 genone 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_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"
-
-	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.12.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.12.ebuild
deleted file mode 100644
index 6621f78498f9..000000000000
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.12.ebuild
+++ /dev/null
@@ -1,74 +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.ebuild,v 1.2 2007/05/02 08:03:27 genone 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_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"
-
-	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.10-r2.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.13.ebuild
index e59504927793..40306ad0d215 100644
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.10-r2.ebuild
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.13.ebuild
@@ -1,6 +1,6 @@
 # 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.10-r2.ebuild,v 1.4 2007/05/02 08:03:27 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.13.ebuild,v 1.1 2007/07/14 07:41:55 mrness Exp $
 
 inherit eutils linux-info
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.linuxant.com/drivers/hcf/full/archive/${P}full/${P}full.tar.
 
 LICENSE="Conexant"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE="doc"
 
 DEPEND="dev-lang/perl
@@ -51,9 +51,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
-	if [ "${KV_EXTRA}" = "-suspend2" ]; then
-		epatch "${FILESDIR}/${P}-suspend2.patch"
-	fi
+	epatch "${FILESDIR}/${P}-implicit-declarations.patch"
 }
 
 src_compile() {
@@ -72,6 +70,9 @@ pkg_preinst() {
 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}"
 }