Version bump that improves compatibility with newer kernels (#208569).

(Portage version: 2.1.4.4)

7 files changed, 52 insertions, 158 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index 4d99c6f76541..ff97b80005d6 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.44 2008/03/24 13:46:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.45 2008/04/13 10:20:56 mrness Exp $
+
+*hsfmodem-7.68.00.09 (13 Apr 2008)
+
+  13 Apr 2008; Alin Năstac <mrness@gentoo.org>
+  -files/hsfmodem-7.60.00.02-udev-group.patch,
+  -files/hsfmodem-7.60.00.09-udev-group.patch,
+  -files/hsfmodem-7.60.00.09-unset-locale.patch,
+  +files/hsfmodem-7.68.00.09-gentoo.patch, -hsfmodem-7.60.00.02.ebuild,
+  -hsfmodem-7.60.00.09-r1.ebuild, +hsfmodem-7.68.00.09.ebuild:
+  Version bump that improves compatibility with newer kernels (#208569).
 
   24 Mar 2008; Markus Meier <maekke@gentoo.org>
   hsfmodem-7.68.00.04-r1.ebuild:
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.60.00.02-udev-group.patch b/net-dialup/hsfmodem/files/hsfmodem-7.60.00.02-udev-group.patch
deleted file mode 100644
index 6ecde46e7b39..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.60.00.02-udev-group.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru hsfmodem-7.60.00.02x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.60.00.02x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.60.00.02x86_64full.orig/scripts/cnxtconfig.in	2006-12-16 02:46:10.000000000 +0200
-+++ hsfmodem-7.60.00.02x86_64full/scripts/cnxtconfig.in	2007-02-10 10:23:18.000000000 +0200
-@@ -1833,7 +1833,7 @@
- 
- 	if [ -d /etc/udev/rules.d ]; then
- 		rm -f /etc/udev/rules.d/@CNXTTARGET@.rules
--		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem"' > /etc/udev/rules.d/@CNXTTARGET@.rules
-+		echo 'KERNEL=="ttyS@CNXTSERDEV@0", SYMLINK="modem", GROUP="dialout"' > /etc/udev/rules.d/@CNXTTARGET@.rules
- 	fi
- 
- 	touch "${cnxtetcdir}/.serial_configured"
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.60.00.09-udev-group.patch b/net-dialup/hsfmodem/files/hsfmodem-7.60.00.09-udev-group.patch
deleted file mode 100644
index d10d05d1d1bf..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.60.00.09-udev-group.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nru hsfmodem-7.60.00.09x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.60.00.09x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.60.00.09x86_64full.orig/scripts/cnxtconfig.in	2007-05-09 04:32:30.000000000 +0300
-+++ hsfmodem-7.60.00.09x86_64full/scripts/cnxtconfig.in	2007-07-14 10:47:10.000000000 +0300
-@@ -1871,9 +1871,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.60.00.09-unset-locale.patch b/net-dialup/hsfmodem/files/hsfmodem-7.60.00.09-unset-locale.patch
deleted file mode 100644
index 097e0ba4e12c..000000000000
--- a/net-dialup/hsfmodem/files/hsfmodem-7.60.00.09-unset-locale.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nru hsfmodem-7.60.00.09x86_64full.orig/makefile hsfmodem-7.60.00.09x86_64full/makefile
---- hsfmodem-7.60.00.09x86_64full.orig/makefile	2007-05-09 04:32:30.000000000 +0300
-+++ hsfmodem-7.60.00.09x86_64full/makefile	2007-08-28 21:40:32.000000000 +0300
-@@ -219,7 +219,7 @@
- 		mv debian/changelog.tmp debian/changelog; \
- 		( echo CNXTDRIVER=$(CNXTDRIVER); echo "TARGET_DISTRO=$$d"; echo "TARGET_KERNEL=$$k"; echo "DISTROKERNHDRSDIR=$(DISTROKERNHDRSDIR)"; echo "PACKAGE_NAME=$(@F)"; echo "PACKAGE_ARCH=$(*D)" ) > debian/target.mak; \
- 	fi
--	unset LANG; unset LOCALE; unset LC_TIME; dpkg-buildpackage -a$(IMPORTED_ARCH) -us -uc || true
-+	unset LANG; unset LOCALE; unset LC_ALL; unset LC_TIME; dpkg-buildpackage -a$(IMPORTED_ARCH) -us -uc || true
- 	rm -f debian/target.mak
- 	mv ../$(CNXTTARGET)modem_*.deb packages/DEBS/$(*D)/$(@F)
- 	rm -f ../$(CNXTTARGET)modem_* ../$(CNXTTARGET)modem-doc_*
-diff -Nru hsfmodem-7.60.00.09x86_64full.orig/modules/kernelcompiler.sh hsfmodem-7.60.00.09x86_64full/modules/kernelcompiler.sh
---- hsfmodem-7.60.00.09x86_64full.orig/modules/kernelcompiler.sh	2007-04-14 20:57:51.000000000 +0300
-+++ hsfmodem-7.60.00.09x86_64full/modules/kernelcompiler.sh	2007-08-28 21:41:15.000000000 +0300
-@@ -8,7 +8,7 @@
- KERNELVER="$1"
- KERNELSRC="$2"
- 
--unset LANG
-+unset LANG LOCALE LC_ALL
- 
- if [ -n "${RPM_BUILD_ROOT}${DEB_HOST_GNU_SYSTEM}" ]; then
- 	if [ -f "${KERNELSRC}/kernelcompiler" ]; then
-diff -Nru hsfmodem-7.60.00.09x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.60.00.09x86_64full/scripts/cnxtconfig.in
---- hsfmodem-7.60.00.09x86_64full.orig/scripts/cnxtconfig.in	2007-08-28 21:39:12.000000000 +0300
-+++ hsfmodem-7.60.00.09x86_64full/scripts/cnxtconfig.in	2007-08-28 21:41:31.000000000 +0300
-@@ -2635,7 +2635,7 @@
- 	exit $?
- fi
- 
--unset LANG
-+unset LANG LOCALE LC_ALL
- 
- umask 022
- 
-diff -Nru hsfmodem-7.60.00.09x86_64full.orig/scripts/patcher.in hsfmodem-7.60.00.09x86_64full/scripts/patcher.in
---- hsfmodem-7.60.00.09x86_64full.orig/scripts/patcher.in	2005-12-08 05:33:22.000000000 +0200
-+++ hsfmodem-7.60.00.09x86_64full/scripts/patcher.in	2007-08-28 21:41:46.000000000 +0300
-@@ -285,8 +285,7 @@
- # Safe environment...
- PATH=/usr/sbin:/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin
- export PATH
--unset LANG
--unset LOCALE
-+unset LANG LOCALE LC_ALL
- umask 022
- 
- if check_tools gawk; then
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
new file mode 100644
index 000000000000..1d0fc8aee0ad
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.09-gentoo.patch
@@ -0,0 +1,27 @@
+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/hsfmodem-7.60.00.02.ebuild b/net-dialup/hsfmodem/hsfmodem-7.60.00.02.ebuild
deleted file mode 100644
index 0298d404f7e0..000000000000
--- a/net-dialup/hsfmodem/hsfmodem-7.60.00.02.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/hsfmodem/hsfmodem-7.60.00.02.ebuild,v 1.4 2007/05/12 09:35:10 beandog 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}-udev-group.patch"
-}
-
-src_compile() {
-	cd "${MY_ARCH_S}"
-	emake all || die "make failed"
-}
-
-src_install () {
-	cd "${MY_ARCH_S}"
-	make PREFIX="${D}/usr/" 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() {
-	elog "To complete the installation and configuration of your HSF modem,"
-	elog "please run hsfconfig."
-}
diff --git a/net-dialup/hsfmodem/hsfmodem-7.60.00.09-r1.ebuild b/net-dialup/hsfmodem/hsfmodem-7.68.00.09.ebuild
index 53a7b1430a91..0df06ef2dba0 100644
--- a/net-dialup/hsfmodem/hsfmodem-7.60.00.09-r1.ebuild
+++ b/net-dialup/hsfmodem/hsfmodem-7.68.00.09.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.60.00.09-r1.ebuild,v 1.1 2007/08/28 18:46:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.68.00.09.ebuild,v 1.1 2008/04/13 10:20:56 mrness Exp $
 
 inherit eutils linux-info
 
@@ -41,8 +41,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${MY_ARCH_S}"
-	epatch "${FILESDIR}/${P}-udev-group.patch"
-	epatch "${FILESDIR}/${P}-unset-locale.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_compile() {
@@ -52,7 +51,7 @@ src_compile() {
 
 src_install () {
 	cd "${MY_ARCH_S}"
-	make PREFIX="${D}/usr/" ROOT="${D}" install || die "make install failed"
+	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
@@ -70,6 +69,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	elog "To complete the installation and configuration of your HSF modem,"
-	elog "please run hsfconfig."
+	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
 }