13 files changed, 13 insertions, 1109 deletions
diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index 89106366c3cb..623e9c9ae6cb 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.56 2009/09/06 15:03:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.57 2009/09/12 04:48:47 mrness Exp $
+
+  12 Sep 2009; Alin Năstac <mrness@gentoo.org>
+  -files/hsfmodem-7.68.00.09-gentoo.patch,
+  -files/hsfmodem-7.68.00.12-gentoo.patch,
+  -files/hsfmodem-7.68.00.13-gentoo.patch,
+  -files/hsfmodem-7.68.00.14-gentoo.patch,
+  -files/hsfmodem-7.80.02.01-gentoo.patch,
+  -files/hsfmodem-7.80.02.03-gentoo.patch, -hsfmodem-7.68.00.09.ebuild,
+  -hsfmodem-7.68.00.12.ebuild, -hsfmodem-7.68.00.13.ebuild,
+  -hsfmodem-7.68.00.14.ebuild, -hsfmodem-7.80.02.01.ebuild,
+  -hsfmodem-7.80.02.03.ebuild:
+  Remove old versions.
 
   06 Sep 2009; Markus Meier <maekke@gentoo.org> hsfmodem-7.80.02.04.ebuild:
   amd64/x86 stable, bug #282166
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.09-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.09-gentoo.patch
deleted file mode 100644
index 1d0fc8aee0ad..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.09-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nru hsfmodem-7.68.00.09full.orig/modules/Makefile hsfmodem-7.68.00.09full/modules/Makefile
---- hsfmodem-7.68.00.09full.orig/modules/Makefile	2008-03-24 17:02:15.000000000 +0200
-+++ hsfmodem-7.68.00.09full/modules/Makefile	2008-04-13 13:15:51.000000000 +0300
-@@ -137,7 +137,7 @@
- ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
- # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
- # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
--CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
-+# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
- endif
- 
- else
-diff -Nru hsfmodem-7.68.00.09full.orig/scripts/cnxtconfig.in hsfmodem-7.68.00.09full/scripts/cnxtconfig.in
---- hsfmodem-7.68.00.09full.orig/scripts/cnxtconfig.in	2008-03-27 21:43:38.000000000 +0200
-+++ hsfmodem-7.68.00.09full/scripts/cnxtconfig.in	2008-04-13 13:15:58.000000000 +0300
-@@ -1973,9 +1973,9 @@
- 	if [ -d /etc/udev/rules.d ]; then
- 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		if [ "@CNXTDRIVER@" = "dgc" ]; then
--			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		else
--		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 	fi
- 	fi
- 
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.12-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.12-gentoo.patch
deleted file mode 100644
index aafc0dcfc3a5..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.12-gentoo.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff -ur hsfmodem-7.68.00.12x86_64full.orig/modules/Makefile hsfmodem-7.68.00.12x86_64full/modules/Makefile
---- hsfmodem-7.68.00.12x86_64full.orig/modules/Makefile	2008-08-01 21:22:36.000000000 +0000
-+++ hsfmodem-7.68.00.12x86_64full/modules/Makefile	2008-08-01 21:22:08.000000000 +0000
-@@ -145,7 +145,7 @@
- ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
- # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
- # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
--CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
-+# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
- endif
- 
- else
-diff -ur hsfmodem-7.68.00.12x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.68.00.12x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.68.00.12x86_64full.orig/scripts/cnxtconfig.in	2008-08-01 21:22:36.000000000 +0000
-+++ hsfmodem-7.68.00.12x86_64full/scripts/cnxtconfig.in	2008-08-01 21:22:08.000000000 +0000
-@@ -1973,9 +1973,9 @@
- 	if [ -d /etc/udev/rules.d ]; then
- 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		if [ "@CNXTDRIVER@" = "dgc" ]; then
--			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		else
--		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 	fi
- 	fi
- 
-diff -ur hsfmodem-7.68.00.12x86_64full.orig/scripts/rccnxt.in hsfmodem-7.68.00.12x86_64full/scripts/rccnxt.in
---- hsfmodem-7.68.00.12x86_64full.orig/scripts/rccnxt.in	2008-08-01 21:22:36.000000000 +0000
-+++ hsfmodem-7.68.00.12x86_64full/scripts/rccnxt.in	2008-08-01 21:23:20.000000000 +0000
-@@ -1,63 +1,12 @@
--#
--# chkconfig: 2345 09 91
--# description: @CNXTDRVDSC@
--#
--### BEGIN INIT INFO
--# Provides: @CNXTTARGET@
--# Should-Start: hotplug coldplug
--# Required-Start: $local_fs
--# Required-Stop: $network
--# Default-Start: 3 5
--# Default-Stop: 0 1 2 6
--# Description: Start @CNXTDRVDSC@
--### END INIT INFO
- 
--if [ -e /etc/runlevels ]; then
--	begincmd="ebegin"
--	endcmd="eend"
--else
--	begincmd="echo"
--	endcmd="/bin/true"
--fi
--
--
--start()
--{
--	${begincmd} "Starting @CNXTDRVDSC@"
-+start() {
-+	ebegin "Starting @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart
--	${endcmd} 0
-+	eend 0
- }
- 
--stop()
--{
--	${begincmd} "Stopping @CNXTDRVDSC@"
-+stop() {
-+	ebegin "Stopping @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop
--	${endcmd} 0
-+	eend 0
- }
--
--restart()
--{
--	stop
--	start
--}
--
--if [ ! -e /etc/runlevels ]; then
--	case "$1" in
--      start)
--			start
--			;;
--      stop)
--			stop
--			;;
--      restart|force-reload|reload)
--			restart
--			;;
--      status)
--			exit 3
--			;;
--      *)
--			echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
--			exit 1
--			;;
--	esac
--fi
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.13-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.13-gentoo.patch
deleted file mode 100644
index 9e0480c20a02..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.13-gentoo.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur hsfmodem-7.68.00.13x86_64full.orig/modules/Makefile hsfmodem-7.68.00.13x86_64full/modules/Makefile
---- hsfmodem-7.68.00.13x86_64full.orig/modules/Makefile	2008-09-09 20:27:06.000000000 +0200
-+++ hsfmodem-7.68.00.13x86_64full/modules/Makefile	2008-09-25 22:39:21.000000000 +0200
-@@ -147,7 +147,7 @@
- ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
- # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
- # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
--CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
-+# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
- endif
- 
- else
-Only in hsfmodem-7.68.00.13x86_64full/modules: Makefile.orig
-diff -ur hsfmodem-7.68.00.13x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.68.00.13x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.68.00.13x86_64full.orig/scripts/cnxtconfig.in	2008-09-08 17:26:30.000000000 +0200
-+++ hsfmodem-7.68.00.13x86_64full/scripts/cnxtconfig.in	2008-09-25 22:39:21.000000000 +0200
-@@ -1973,9 +1973,9 @@
- 	if [ -d /etc/udev/rules.d ]; then
- 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		if [ "@CNXTDRIVER@" = "dgc" ]; then
--			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
- 		else
--		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
- 	fi
- 	fi
- 
-diff -ur hsfmodem-7.68.00.13x86_64full.orig/scripts/rccnxt.in hsfmodem-7.68.00.13x86_64full/scripts/rccnxt.in
---- hsfmodem-7.68.00.13x86_64full.orig/scripts/rccnxt.in	2004-11-22 22:59:29.000000000 +0100
-+++ hsfmodem-7.68.00.13x86_64full/scripts/rccnxt.in	2008-09-25 22:39:21.000000000 +0200
-@@ -1,63 +1,12 @@
--#
--# chkconfig: 2345 09 91
--# description: @CNXTDRVDSC@
--#
--### BEGIN INIT INFO
--# Provides: @CNXTTARGET@
--# Should-Start: hotplug coldplug
--# Required-Start: $local_fs
--# Required-Stop: $network
--# Default-Start: 3 5
--# Default-Stop: 0 1 2 6
--# Description: Start @CNXTDRVDSC@
--### END INIT INFO
- 
--if [ -e /etc/runlevels ]; then
--	begincmd="ebegin"
--	endcmd="eend"
--else
--	begincmd="echo"
--	endcmd="/bin/true"
--fi
--
--
--start()
--{
--	${begincmd} "Starting @CNXTDRVDSC@"
-+start() {
-+	ebegin "Starting @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart
--	${endcmd} 0
-+	eend 0
- }
- 
--stop()
--{
--	${begincmd} "Stopping @CNXTDRVDSC@"
-+stop() {
-+	ebegin "Stopping @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop
--	${endcmd} 0
-+	eend 0
- }
--
--restart()
--{
--	stop
--	start
--}
--
--if [ ! -e /etc/runlevels ]; then
--	case "$1" in
--      start)
--			start
--			;;
--      stop)
--			stop
--			;;
--      restart|force-reload|reload)
--			restart
--			;;
--      status)
--			exit 3
--			;;
--      *)
--			echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
--			exit 1
--			;;
--	esac
--fi
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.14-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.14-gentoo.patch
deleted file mode 100644
index b230164efc03..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.68.00.14-gentoo.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -ur hsfmodem-7.68.00.14x86_64full.orig/diag/makefile hsfmodem-7.68.00.14x86_64full/diag/makefile
---- hsfmodem-7.68.00.14x86_64full.orig/diag/makefile	2006-01-13 19:23:50.000000000 +0000
-+++ hsfmodem-7.68.00.14x86_64full/diag/makefile	2008-10-18 07:59:20.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 -ur hsfmodem-7.68.00.14x86_64full.orig/modules/Makefile hsfmodem-7.68.00.14x86_64full/modules/Makefile
---- hsfmodem-7.68.00.14x86_64full.orig/modules/Makefile	2008-09-09 18:27:06.000000000 +0000
-+++ hsfmodem-7.68.00.14x86_64full/modules/Makefile	2008-10-18 07:59:54.000000000 +0000
-@@ -147,7 +147,7 @@
- ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
- # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
- # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
--CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
-+# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
- endif
- 
- else
-diff -ur hsfmodem-7.68.00.14x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.68.00.14x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.68.00.14x86_64full.orig/scripts/cnxtconfig.in	2008-10-01 16:13:30.000000000 +0000
-+++ hsfmodem-7.68.00.14x86_64full/scripts/cnxtconfig.in	2008-10-18 07:59:54.000000000 +0000
-@@ -1973,9 +1973,9 @@
- 	if [ -d /etc/udev/rules.d ]; then
- 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		if [ "@CNXTDRIVER@" = "dgc" ]; then
--			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
- 		else
--		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
- 	fi
- 	fi
- 
-diff -ur hsfmodem-7.68.00.14x86_64full.orig/scripts/rccnxt.in hsfmodem-7.68.00.14x86_64full/scripts/rccnxt.in
---- hsfmodem-7.68.00.14x86_64full.orig/scripts/rccnxt.in	2004-11-22 21:59:29.000000000 +0000
-+++ hsfmodem-7.68.00.14x86_64full/scripts/rccnxt.in	2008-10-18 07:59:54.000000000 +0000
-@@ -1,63 +1,12 @@
--#
--# chkconfig: 2345 09 91
--# description: @CNXTDRVDSC@
--#
--### BEGIN INIT INFO
--# Provides: @CNXTTARGET@
--# Should-Start: hotplug coldplug
--# Required-Start: $local_fs
--# Required-Stop: $network
--# Default-Start: 3 5
--# Default-Stop: 0 1 2 6
--# Description: Start @CNXTDRVDSC@
--### END INIT INFO
- 
--if [ -e /etc/runlevels ]; then
--	begincmd="ebegin"
--	endcmd="eend"
--else
--	begincmd="echo"
--	endcmd="/bin/true"
--fi
--
--
--start()
--{
--	${begincmd} "Starting @CNXTDRVDSC@"
-+start() {
-+	ebegin "Starting @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart
--	${endcmd} 0
-+	eend 0
- }
- 
--stop()
--{
--	${begincmd} "Stopping @CNXTDRVDSC@"
-+stop() {
-+	ebegin "Stopping @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop
--	${endcmd} 0
-+	eend 0
- }
--
--restart()
--{
--	stop
--	start
--}
--
--if [ ! -e /etc/runlevels ]; then
--	case "$1" in
--      start)
--			start
--			;;
--      stop)
--			stop
--			;;
--      restart|force-reload|reload)
--			restart
--			;;
--      status)
--			exit 3
--			;;
--      *)
--			echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
--			exit 1
--			;;
--	esac
--fi
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.80.02.01-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.80.02.01-gentoo.patch
deleted file mode 100644
index f34e5b0395f1..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.80.02.01-gentoo.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Nru hsfmodem-7.80.02.01x86_64full.orig/diag/makefile hsfmodem-7.80.02.01x86_64full/diag/makefile
---- hsfmodem-7.80.02.01x86_64full.orig/diag/makefile	2006-01-13 19:23:50.000000000 +0000
-+++ hsfmodem-7.80.02.01x86_64full/diag/makefile	2009-01-12 22:19:44.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 -Nru hsfmodem-7.80.02.01x86_64full.orig/modules/Makefile hsfmodem-7.80.02.01x86_64full/modules/Makefile
---- hsfmodem-7.80.02.01x86_64full.orig/modules/Makefile	2008-12-18 23:46:04.000000000 +0000
-+++ hsfmodem-7.80.02.01x86_64full/modules/Makefile	2009-01-12 22:19:44.000000000 +0000
-@@ -156,7 +156,7 @@
- ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
- # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
- # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
--CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
-+# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
- endif
- 
- else
-diff -Nru hsfmodem-7.80.02.01x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.80.02.01x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.80.02.01x86_64full.orig/scripts/cnxtconfig.in	2008-12-19 00:29:39.000000000 +0000
-+++ hsfmodem-7.80.02.01x86_64full/scripts/cnxtconfig.in	2009-01-12 22:19:44.000000000 +0000
-@@ -1973,9 +1973,9 @@
- 	if [ -d /etc/udev/rules.d ]; then
- 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		if [ "@CNXTDRIVER@" = "dgc" ]; then
--			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
- 		else
--		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
- 	fi
- 	fi
- 
-diff -Nru hsfmodem-7.80.02.01x86_64full.orig/scripts/rccnxt.in hsfmodem-7.80.02.01x86_64full/scripts/rccnxt.in
---- hsfmodem-7.80.02.01x86_64full.orig/scripts/rccnxt.in	2004-11-22 21:59:29.000000000 +0000
-+++ hsfmodem-7.80.02.01x86_64full/scripts/rccnxt.in	2009-01-12 22:19:44.000000000 +0000
-@@ -1,63 +1,12 @@
--#
--# chkconfig: 2345 09 91
--# description: @CNXTDRVDSC@
--#
--### BEGIN INIT INFO
--# Provides: @CNXTTARGET@
--# Should-Start: hotplug coldplug
--# Required-Start: $local_fs
--# Required-Stop: $network
--# Default-Start: 3 5
--# Default-Stop: 0 1 2 6
--# Description: Start @CNXTDRVDSC@
--### END INIT INFO
- 
--if [ -e /etc/runlevels ]; then
--	begincmd="ebegin"
--	endcmd="eend"
--else
--	begincmd="echo"
--	endcmd="/bin/true"
--fi
--
--
--start()
--{
--	${begincmd} "Starting @CNXTDRVDSC@"
-+start() {
-+	ebegin "Starting @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart
--	${endcmd} 0
-+	eend 0
- }
- 
--stop()
--{
--	${begincmd} "Stopping @CNXTDRVDSC@"
-+stop() {
-+	ebegin "Stopping @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop
--	${endcmd} 0
-+	eend 0
- }
--
--restart()
--{
--	stop
--	start
--}
--
--if [ ! -e /etc/runlevels ]; then
--	case "$1" in
--      start)
--			start
--			;;
--      stop)
--			stop
--			;;
--      restart|force-reload|reload)
--			restart
--			;;
--      status)
--			exit 3
--			;;
--      *)
--			echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
--			exit 1
--			;;
--	esac
--fi
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch b/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch
deleted file mode 100644
index 069286519fbd..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Nru hsfmodem-7.80.02.03x86_64full.orig/diag/makefile hsfmodem-7.80.02.03x86_64full/diag/makefile
---- hsfmodem-7.80.02.03x86_64full.orig/diag/makefile	2006-01-13 19:23:50.000000000 +0000
-+++ hsfmodem-7.80.02.03x86_64full/diag/makefile	2009-03-13 20:38:16.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 -Nru hsfmodem-7.80.02.03x86_64full.orig/modules/Makefile hsfmodem-7.80.02.03x86_64full/modules/Makefile
---- hsfmodem-7.80.02.03x86_64full.orig/modules/Makefile	2009-02-20 21:30:12.000000000 +0000
-+++ hsfmodem-7.80.02.03x86_64full/modules/Makefile	2009-03-13 20:38:16.000000000 +0000
-@@ -158,7 +158,7 @@
- ifeq ($(ON_BUILD_SYSTEM)-$(CONFIG_SND_HDA_INTEL),no-)
- # On Ubuntu Gutsy (7.10), the HDA modules are not included in linux-image but in a seprarate package
- # and CONFIG_SND_HDA_INTEL is not enabled in the kernel .config file
--CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
-+# CONFIG_SND_HDA_INTEL=$(shell modprobe -n snd-hda-intel > /dev/null 2>&1 && echo y || echo n)
- endif
- 
- MODULAR_HDA := $(shell test -e  ${REAL_KERNELSRC}/include/sound/hda_codec.h && echo yes || echo no)
-diff -Nru hsfmodem-7.80.02.03x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.80.02.03x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.80.02.03x86_64full.orig/scripts/cnxtconfig.in	2009-02-20 21:30:17.000000000 +0000
-+++ hsfmodem-7.80.02.03x86_64full/scripts/cnxtconfig.in	2009-03-13 20:38:16.000000000 +0000
-@@ -1994,9 +1994,9 @@
- 	if [ -d /etc/udev/rules.d ]; then
- 		rm -f /etc/udev/rules.d/00-@CNXTTARGET@.rules
- 		if [ "@CNXTDRIVER@" = "dgc" ]; then
--			echo 'KERNEL=="ttyACM0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+			echo 'KERNEL=="ttyACM0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
- 		else
--		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/00-@CNXTTARGET@.rules
-+		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/99-@CNXTTARGET@.rules
- 	fi
- 	fi
- 
-diff -Nru hsfmodem-7.80.02.03x86_64full.orig/scripts/rccnxt.in hsfmodem-7.80.02.03x86_64full/scripts/rccnxt.in
---- hsfmodem-7.80.02.03x86_64full.orig/scripts/rccnxt.in	2004-11-22 21:59:29.000000000 +0000
-+++ hsfmodem-7.80.02.03x86_64full/scripts/rccnxt.in	2009-03-13 20:38:16.000000000 +0000
-@@ -1,63 +1,12 @@
--#
--# chkconfig: 2345 09 91
--# description: @CNXTDRVDSC@
--#
--### BEGIN INIT INFO
--# Provides: @CNXTTARGET@
--# Should-Start: hotplug coldplug
--# Required-Start: $local_fs
--# Required-Stop: $network
--# Default-Start: 3 5
--# Default-Stop: 0 1 2 6
--# Description: Start @CNXTDRVDSC@
--### END INIT INFO
- 
--if [ -e /etc/runlevels ]; then
--	begincmd="ebegin"
--	endcmd="eend"
--else
--	begincmd="echo"
--	endcmd="/bin/true"
--fi
--
--
--start()
--{
--	${begincmd} "Starting @CNXTDRVDSC@"
-+start() {
-+	ebegin "Starting @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstart
--	${endcmd} 0
-+	eend 0
- }
- 
--stop()
--{
--	${begincmd} "Stopping @CNXTDRVDSC@"
-+stop() {
-+	ebegin "Stopping @CNXTDRVDSC@"
- 	@CNXTSBINDIR@/@CNXTTARGET@config --rcstop
--	${endcmd} 0
-+	eend 0
- }
--
--restart()
--{
--	stop
--	start
--}
--
--if [ ! -e /etc/runlevels ]; then
--	case "$1" in
--      start)
--			start
--			;;
--      stop)
--			stop
--			;;
--      restart|force-reload|reload)
--			restart
--			;;
--      status)
--			exit 3
--			;;
--      *)
--			echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
--			exit 1
--			;;
--	esac
--fi
diff --git a/net-dialup/hsfmodem/hsfmodem-7.68.00.09.ebuild b/net-dialup/hsfmodem/hsfmodem-7.68.00.09.ebuild
deleted file mode 100644
index 311de814f029..000000000000
--- a/net-dialup/hsfmodem/hsfmodem-7.68.00.09.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.68.00.09.ebuild,v 1.2 2008/05/23 21:00:39 maekke Exp $
-
-inherit eutils linux-info
-
-#The document is the same as in hcfpcimodem, even if it has a different URL
-MY_DOC="100498D_RM_HxF_Released.pdf"
-
-DESCRIPTION="Linuxant's modem driver for Conexant HSF chipset"
-HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php"
-SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz )
-	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )
-	doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )"
-
-LICENSE="Conexant"
-KEYWORDS="-* amd64 x86"
-IUSE="doc"
-SLOT="0"
-
-DEPEND="dev-lang/perl
-	app-arch/cpio"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if useq x86; then
-		MY_ARCH_S="${S}/${P}full"
-	elif useq amd64; then
-		MY_ARCH_S="${S}/${P}x86_64full"
-	fi
-
-	local f
-	QA_EXECSTACK=""
-	for f in pcibasic2 mc97ich mc97via mc97ali mc97ati mc97sis usbcd2 soar hda engine ; do
-		QA_EXECSTACK="${QA_EXECSTACK} usr/lib/hsfmodem/modules/imported/hsf${f}-i386.O"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${MY_ARCH_S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	cd "${MY_ARCH_S}"
-	emake all || die "make failed"
-}
-
-src_install () {
-	cd "${MY_ARCH_S}"
-	make ROOT="${D}" install || die "make install failed"
-
-	# on testing arches, kernelcompiler.sh permissions are 0600 (#158736)
-	fperms a+rx /usr/lib/hsfmodem/modules/kernelcompiler.sh
-
-	use doc && dodoc "${DISTDIR}/${MY_DOC}"
-}
-
-pkg_preinst() {
-	local NVMDIR="${ROOT}/etc/${PN}/nvm"
-	if [ -d "${NVMDIR}" ]; then
-		einfo "Cleaning ${NVMDIR}..."
-		rm -rf "${NVMDIR}"
-		eend
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = / ]; then
-		elog "To complete the installation and configuration of your HSF modem,"
-		elog "please run hsfconfig."
-	fi
-}
-
-pkg_prerm() {
-	if [ "${ROOT}" = / -a -f /etc/init.d/hsf ] ; then
-		hsfconfig --remove || die "hsfconfig --remove failed"
-	fi
-}
diff --git a/net-dialup/hsfmodem/hsfmodem-7.68.00.12.ebuild b/net-dialup/hsfmodem/hsfmodem-7.68.00.12.ebuild
deleted file mode 100644
index 6cbb17db49bc..000000000000
--- a/net-dialup/hsfmodem/hsfmodem-7.68.00.12.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.68.00.12.ebuild,v 1.3 2008/09/23 19:57:13 mrness Exp $
-
-inherit eutils linux-info
-
-#The document is the same as in hcfpcimodem, even if it has a different URL
-MY_DOC="100498D_RM_HxF_Released.pdf"
-
-DESCRIPTION="Linuxant's modem driver for Conexant HSF chipset"
-HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php"
-SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz )
-	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )
-	doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )"
-
-LICENSE="Conexant"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc"
-SLOT="0"
-
-DEPEND="dev-lang/perl
-	app-arch/cpio"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if useq x86; then
-		MY_ARCH_S="${S}/${P}full"
-	elif useq amd64; then
-		MY_ARCH_S="${S}/${P}x86_64full"
-	fi
-
-	local f
-	QA_EXECSTACK=""
-	for f in pcibasic2 mc97ich mc97via mc97ali mc97ati mc97sis usbcd2 soar hda engine ; do
-		QA_EXECSTACK="${QA_EXECSTACK} usr/lib/hsfmodem/modules/imported/hsf${f}-i386.O"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${MY_ARCH_S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	cd "${MY_ARCH_S}"
-	emake all || die "make failed"
-}
-
-src_install () {
-	cd "${MY_ARCH_S}"
-	make ROOT="${D}" install || die "make install failed"
-
-	# on testing arches, kernelcompiler.sh permissions are 0600 (#158736)
-	fperms a+rx /usr/lib/hsfmodem/modules/kernelcompiler.sh
-
-	use doc && dodoc "${DISTDIR}/${MY_DOC}"
-}
-
-pkg_preinst() {
-	local NVMDIR="${ROOT}/etc/${PN}/nvm"
-	if [ -d "${NVMDIR}" ]; then
-		einfo "Cleaning ${NVMDIR}..."
-		rm -rf "${NVMDIR}"
-		eend
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = / ]; then
-		elog "To complete the installation and configuration of your HSF modem,"
-		elog "please run hsfconfig."
-	fi
-}
-
-pkg_prerm() {
-	if [ "${ROOT}" = / -a -f /etc/init.d/hsf ] ; then
-		hsfconfig --remove || die "hsfconfig --remove failed"
-	fi
-}
diff --git a/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild b/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild
deleted file mode 100644
index 8c2dca8b6640..000000000000
--- a/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild,v 1.1 2008/09/25 20:44:02 mrness Exp $
-
-inherit eutils linux-info
-
-#The document is the same as in hcfpcimodem, even if it has a different URL
-MY_DOC="100498D_RM_HxF_Released.pdf"
-
-DESCRIPTION="Linuxant's modem driver for Conexant HSF chipset"
-HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php"
-SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz )
-	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )
-	doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )"
-
-LICENSE="Conexant"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc"
-SLOT="0"
-
-DEPEND="dev-lang/perl
-	app-arch/cpio"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if useq x86; then
-		MY_ARCH_S="${S}/${P}full"
-	elif useq amd64; then
-		MY_ARCH_S="${S}/${P}x86_64full"
-	fi
-
-	local f
-	QA_EXECSTACK=""
-	for f in pcibasic2 mc97ich mc97via mc97ali mc97ati mc97sis usbcd2 soar hda engine ; do
-		QA_EXECSTACK="${QA_EXECSTACK} usr/lib/hsfmodem/modules/imported/hsf${f}-i386.O"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${MY_ARCH_S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	cd "${MY_ARCH_S}"
-	emake all || die "make failed"
-}
-
-src_install () {
-	cd "${MY_ARCH_S}"
-	make ROOT="${D}" install || die "make install failed"
-
-	# on testing arches, kernelcompiler.sh permissions are 0600 (#158736)
-	fperms a+rx /usr/lib/hsfmodem/modules/kernelcompiler.sh
-
-	use doc && dodoc "${DISTDIR}/${MY_DOC}"
-}
-
-pkg_preinst() {
-	local NVMDIR="${ROOT}/etc/${PN}/nvm"
-	if [ -d "${NVMDIR}" ]; then
-		einfo "Cleaning ${NVMDIR}..."
-		rm -rf "${NVMDIR}"
-		eend
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = / ]; then
-		elog "To complete the installation and configuration of your HSF modem,"
-		elog "please run hsfconfig."
-	fi
-}
-
-pkg_prerm() {
-	if [ "${ROOT}" = / -a -f /etc/init.d/hsf ] ; then
-		hsfconfig --remove || die "hsfconfig --remove failed"
-	fi
-}
diff --git a/net-dialup/hsfmodem/hsfmodem-7.68.00.14.ebuild b/net-dialup/hsfmodem/hsfmodem-7.68.00.14.ebuild
deleted file mode 100644
index 54b180e8c07e..000000000000
--- a/net-dialup/hsfmodem/hsfmodem-7.68.00.14.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.68.00.14.ebuild,v 1.1 2008/10/18 08:05:05 mrness Exp $
-
-inherit eutils linux-info
-
-#The document is the same as in hcfpcimodem, even if it has a different URL
-MY_DOC="100498D_RM_HxF_Released.pdf"
-
-DESCRIPTION="Linuxant's modem driver for Conexant HSF chipset"
-HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php"
-SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz )
-	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )
-	doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )"
-
-LICENSE="Conexant"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc"
-SLOT="0"
-
-DEPEND="dev-lang/perl
-	app-arch/cpio"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if useq x86; then
-		MY_ARCH_S="${S}/${P}full"
-	elif useq amd64; then
-		MY_ARCH_S="${S}/${P}x86_64full"
-	fi
-
-	local f
-	QA_EXECSTACK=""
-	for f in pcibasic2 mc97ich mc97via mc97ali mc97ati mc97sis usbcd2 soar hda engine ; do
-		QA_EXECSTACK="${QA_EXECSTACK} usr/lib/hsfmodem/modules/imported/hsf${f}-i386.O"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${MY_ARCH_S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	cd "${MY_ARCH_S}"
-	emake all || die "make failed"
-}
-
-src_install () {
-	cd "${MY_ARCH_S}"
-	make ROOT="${D}" install || die "make install failed"
-
-	# on testing arches, kernelcompiler.sh permissions are 0600 (#158736)
-	fperms a+rx /usr/lib/hsfmodem/modules/kernelcompiler.sh
-
-	use doc && dodoc "${DISTDIR}/${MY_DOC}"
-}
-
-pkg_preinst() {
-	local NVMDIR="${ROOT}/etc/${PN}/nvm"
-	if [ -d "${NVMDIR}" ]; then
-		einfo "Cleaning ${NVMDIR}..."
-		rm -rf "${NVMDIR}"
-		eend
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = / ]; then
-		elog "To complete the installation and configuration of your HSF modem,"
-		elog "please run hsfconfig."
-	fi
-}
-
-pkg_prerm() {
-	if [ "${ROOT}" = / -a -f /etc/init.d/hsf ] ; then
-		hsfconfig --remove || die "hsfconfig --remove failed"
-	fi
-}
diff --git a/net-dialup/hsfmodem/hsfmodem-7.80.02.01.ebuild b/net-dialup/hsfmodem/hsfmodem-7.80.02.01.ebuild
deleted file mode 100644
index fcdd2a1af47b..000000000000
--- a/net-dialup/hsfmodem/hsfmodem-7.80.02.01.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.80.02.01.ebuild,v 1.1 2009/01/12 22:25:48 mrness Exp $
-
-inherit eutils linux-info
-
-#The document is the same as in hcfpcimodem, even if it has a different URL
-MY_DOC="100498D_RM_HxF_Released.pdf"
-
-DESCRIPTION="Linuxant's modem driver for Conexant HSF chipset"
-HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php"
-SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz )
-	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )
-	doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )"
-
-LICENSE="Conexant"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc"
-SLOT="0"
-
-DEPEND="dev-lang/perl
-	app-arch/cpio"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if useq x86; then
-		MY_ARCH_S="${S}/${P}full"
-	elif useq amd64; then
-		MY_ARCH_S="${S}/${P}x86_64full"
-	fi
-
-	local f
-	QA_EXECSTACK=""
-	for f in pcibasic2 mc97ich mc97via mc97ali mc97ati mc97sis usbcd2 soar hda engine ; do
-		QA_EXECSTACK="${QA_EXECSTACK} usr/lib/hsfmodem/modules/imported/hsf${f}-i386.O"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${MY_ARCH_S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	cd "${MY_ARCH_S}"
-	emake all || die "make failed"
-}
-
-src_install () {
-	cd "${MY_ARCH_S}"
-	make ROOT="${D}" install || die "make install failed"
-
-	# on testing arches, kernelcompiler.sh permissions are 0600 (#158736)
-	fperms a+rx /usr/lib/hsfmodem/modules/kernelcompiler.sh
-
-	use doc && dodoc "${DISTDIR}/${MY_DOC}"
-}
-
-pkg_preinst() {
-	local NVMDIR="${ROOT}/etc/${PN}/nvm"
-	if [ -d "${NVMDIR}" ]; then
-		einfo "Cleaning ${NVMDIR}..."
-		rm -rf "${NVMDIR}"
-		eend
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = / ]; then
-		elog "To complete the installation and configuration of your HSF modem,"
-		elog "please run hsfconfig."
-	fi
-}
-
-pkg_prerm() {
-	if [ "${ROOT}" = / -a -f /etc/init.d/hsf ] ; then
-		hsfconfig --remove || die "hsfconfig --remove failed"
-	fi
-}
diff --git a/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild b/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild
deleted file mode 100644
index 2add7e2e260b..000000000000
--- a/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild,v 1.1 2009/03/13 20:41:47 mrness Exp $
-
-inherit eutils linux-info
-
-#The document is the same as in hcfpcimodem, even if it has a different URL
-MY_DOC="100498D_RM_HxF_Released.pdf"
-
-DESCRIPTION="Linuxant's modem driver for Conexant HSF chipset"
-HOMEPAGE="http://www.linuxant.com/drivers/hsf/index.php"
-SRC_URI="x86? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${P}full.tar.gz )
-	amd64? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}x86_64full/${P}x86_64full.tar.gz )
-	doc? ( http://www.linuxant.com/drivers/hsf/full/archive/${P}full/${MY_DOC} )"
-
-LICENSE="Conexant"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="doc"
-SLOT="0"
-
-DEPEND="dev-lang/perl
-	app-arch/cpio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if useq x86; then
-		MY_ARCH_S="${S}/${P}full"
-	elif useq amd64; then
-		MY_ARCH_S="${S}/${P}x86_64full"
-	fi
-
-	local f
-	QA_EXECSTACK=""
-	for f in pcibasic2 mc97ich mc97via mc97ali mc97ati mc97sis usbcd2 soar hda engine ; do
-		QA_EXECSTACK="${QA_EXECSTACK} usr/lib/hsfmodem/modules/imported/hsf${f}-i386.O"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${MY_ARCH_S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-}
-
-src_compile() {
-	cd "${MY_ARCH_S}"
-	emake all || die "make failed"
-}
-
-src_install () {
-	cd "${MY_ARCH_S}"
-	make ROOT="${D}" install || die "make install failed"
-
-	# on testing arches, kernelcompiler.sh permissions are 0600 (#158736)
-	fperms a+rx /usr/lib/hsfmodem/modules/kernelcompiler.sh
-
-	use doc && dodoc "${DISTDIR}/${MY_DOC}"
-}
-
-pkg_preinst() {
-	local NVMDIR="${ROOT}/etc/${PN}/nvm"
-	if [ -d "${NVMDIR}" ]; then
-		einfo "Cleaning ${NVMDIR}..."
-		rm -rf "${NVMDIR}"
-		eend
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = / ]; then
-		elog "To complete the installation and configuration of your HSF modem,"
-		elog "please run hsfconfig."
-	fi
-}
-
-pkg_prerm() {
-	if [ "${ROOT}" = / -a -f /etc/init.d/hsf ] ; then
-		hsfconfig --remove || die "hsfconfig --remove failed"
-	fi
-}