Version bump that fixes bug 261888.

(Portage version: 2.1.6.7/cvs/Linux x86_64)

3 files changed, 219 insertions, 1 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index 506d2e7f6dbf..91e89aca212b 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.53 2009/01/12 22:25:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.54 2009/03/13 20:41:47 mrness Exp $
+
+*hsfmodem-7.80.02.03 (13 Mar 2009)
+
+  13 Mar 2009; Alin Năstac <mrness@gentoo.org>
+  +files/hsfmodem-7.80.02.03-gentoo.patch, +hsfmodem-7.80.02.03.ebuild:
+  Version bump that fixes bug 261888.
 
 *hsfmodem-7.80.02.01 (12 Jan 2009)
 
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
new file mode 100644
index 000000000000..069286519fbd
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.80.02.03-gentoo.patch
@@ -0,0 +1,129 @@
+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.80.02.03.ebuild b/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild
new file mode 100644
index 000000000000..2add7e2e260b
--- /dev/null
+++ b/net-dialup/hsfmodem/hsfmodem-7.80.02.03.ebuild
@@ -0,0 +1,83 @@
+# 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
+}