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

Package-Manager: portage-2.1.4.4

8 files changed, 60 insertions, 171 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/Manifest b/net-dialup/hsfmodem/Manifest
index 43f7a739530e..085937cffd49 100644
--- a/net-dialup/hsfmodem/Manifest
+++ b/net-dialup/hsfmodem/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX hsfmodem-7.60.00.02-udev-group.patch 669 RMD160 aa87f39bed47927f2ddec3d97782c1098c34be76 SHA1 d957f13c66c5e4e68638a889f8edae9b8b378a85 SHA256 c5062eb56772328340804e415b797818e946efd10eb51689f802a0cb25db0f78
-AUX hsfmodem-7.60.00.09-udev-group.patch 878 RMD160 a0b2fc9b469ca29841201c9affa96dc9b627e607 SHA1 88b8cb737ab5819eb03c8a8bf81844bc0a31919b SHA256 5866c7310d82a7f48a2b1282baeba556e9762fc6f16ddbf3951d9c001fe708ec
-AUX hsfmodem-7.60.00.09-unset-locale.patch 2323 RMD160 ed2e39ee3fb67351b61d8c527d06202b6745f75a SHA1 f77ffff17d40d7b6300ee7708e5ebd0c4cd72796 SHA256 fc0ca9ee198ccb50433100a73dd32ce8eaee0c9166fd17d25c3e5f7e82378228
 AUX hsfmodem-7.68.00.04-sandbox-violation.patch 740 RMD160 c09db08e714699a5626d5e13d77ba9defbf3c1ac SHA1 4b799da480effe0c4e6ddeb36c20011bb28a64f2 SHA256 3747cf420ba2fd347965fb6ce2cea7976b12c2e73ba26853fe0c29bd1a752cf6
 AUX hsfmodem-7.68.00.04-udev-group.patch 878 RMD160 704fd934424605f3a5f95c4ab52a983d92ec1b37 SHA1 75413e2b8a59c3baf7cd4416b0d958c371e13c5e SHA256 35051a736d8dbd4d2b5019fed410b527708caa9431013e509f890737aeebe5a1
+AUX hsfmodem-7.68.00.09-gentoo.patch 1570 RMD160 e9e60ded13fea2fefd057fc97c9b24fb9e7e0bb2 SHA1 73428460ec1afc359971bf120966141061f39413 SHA256 16507783f89fcbe625b370adb13f552aa26b939b5c3ef10c3d893cf3649f4bda
 DIST 100498D_RM_HxF_Released.pdf 718949 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a SHA1 519c9b064e734873d67cf9c17d8eb1389a6f4eef SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
-DIST hsfmodem-7.60.00.02full.tar.gz 1377050 RMD160 31e5f87892f4cac91fa9c1ca4b97c29a76d659a3 SHA1 4c3f67e2e5124268c55f97be1418e35b6d04cfc0 SHA256 2f0334e0ae181f9936687b6d65816627accbeb24e970ae030cfcde969785f1e1
-DIST hsfmodem-7.60.00.02x86_64full.tar.gz 1494128 RMD160 5dd69af4f07e38fdf2969e9a32e4d80c913724da SHA1 de4e786f9299ad2fdb89d4c5b0e48f735ba9b4f1 SHA256 81d36b8691a317f12114ecddb868bb81f9ce1621a9e8519050a639c2561dea68
-DIST hsfmodem-7.60.00.09full.tar.gz 1391509 RMD160 aeb3eec97a5f8ba43bda7a9a058186181d7f8576 SHA1 519b6b8ac37a8a11e96edb8b2c7d8863f0b05671 SHA256 7cf3dea2a66798846be376b2ab6499ab5ff40f68844baadcd52046a1f4fb3cfb
-DIST hsfmodem-7.60.00.09x86_64full.tar.gz 1509106 RMD160 c7b0c6d09b4a51551ce361bdd528f5322d128c87 SHA1 78235486d18df849b0b9fd216d12f334b95d3d48 SHA256 08a73b67a7ca47b7aaad1c5d33d4e4b23d882263869f8062b57caa114da05589
 DIST hsfmodem-7.68.00.04full.tar.gz 1463702 RMD160 4dc5377998495b817a1677f09160a7ef701f7f1f SHA1 d2a9f72566ce9fa84df80e7f562b543c5f1e3194 SHA256 7b9a985020e1d2fe039d26ad1de97c7bfa64a62b51b5de296f4fff8254a26292
 DIST hsfmodem-7.68.00.04x86_64full.tar.gz 1595024 RMD160 f9c39e6820fc71c79dc73e316a14c7295e4fe17d SHA1 8113f5e066b3d61ef9f555ef4d5154f8f30d2559 SHA256 86592028760b7a334659c6fdca86a02edac54c30f03307b5717dad4b062bd527
-EBUILD hsfmodem-7.60.00.02.ebuild 1951 RMD160 c40bf83685aaa0e1057c104085a8a43c39a1edee SHA1 0feb8259f1ad9a76affe1ad9dee15683b088959d SHA256 76decf2f125f7267dcea25cc690d175349b2c080e8dd269f0ec9b8dd8ffabc2a
-EBUILD hsfmodem-7.60.00.09-r1.ebuild 2001 RMD160 51989d3b66b0785e357ff75204e33a357fd6b5a5 SHA1 99c30facb2c7471eeb133b73c980fb7424289491 SHA256 5f0c8b125369117277bcddf3dbf0c4ba3a4a79d882eb8a6d64cc4a77fd8573a4
+DIST hsfmodem-7.68.00.09full.tar.gz 1468087 RMD160 5a1ddf2cc3f5949e279819d3f5710ed63f81f832 SHA1 323e4270e969f1ee2763313cc9f0bd29444fbb2b SHA256 380a600676bfcf81967b321e95e870b238aaa7b39310d2b9a4f0d8bc9ac5d92c
+DIST hsfmodem-7.68.00.09x86_64full.tar.gz 1595414 RMD160 0e4ced44d0f9327ae8f6c2b3c4af0759e859bda6 SHA1 a3d0cc78a9974c659dfb9245a17ec9fcfe0bc6fd SHA256 d235f2ef546ed928cd6c96411081d4d6dfbdaa72592fe1b25f7c7c33da92b239
 EBUILD hsfmodem-7.68.00.04-r1.ebuild 2147 RMD160 00f751e3bdb542e1b2191ea9371d98c19157dd49 SHA1 b9aca76a5a1cbfbd989ebe9ca5f48ad88c59d91d SHA256 83338cacb9154082060ae05780a99c8bd0d2252d15cbc1c5444cd457e16fb9c2
-MISC ChangeLog 10777 RMD160 522a5e2b9d4e35e4012f58ca67d58aec6d8e1647 SHA1 2920ac464484c7eb28d95941730fb77ac121b9ab SHA256 9757c69a4573b6c87e33d2c5e10c18abd494cf3eac6501722dedd580a5684f60
+EBUILD hsfmodem-7.68.00.09.ebuild 2091 RMD160 31baf2ea5d6752cb3ce1f404c70aa1ca1a52b7d0 SHA1 2434c92bc7726333e795ffc1329c094a74d90ee7 SHA256 970c33a69a42bbab7ba90d61fff2a4252f96914d28c0d29421febb43b600d619
+MISC ChangeLog 11213 RMD160 8060981de0056fc7386bc98776d9d7c17f3868ce SHA1 7005f72bbfbb514eadf2e34ff7406534947c71a0 SHA256 f8e6438e4a94183910c9f09b521649ce6fb51bb911f723c9938deae092426be6
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH57EYkKaRLQcq0GIRAnULAJ9e2h6Ls2jU0cFsTGG1HM+kTHVgTACgsbct
-TRMcxyFh6yG0RqC6L1iohFo=
-=rTlc
+iD8DBQFIAd6R+fWpoTWIA9ERAkH8AJ9+KWMUYqO+swhsJIc2V3Njsh+8PQCeMvFe
+z7p7VZ8XplLIiIGf/o+L46c=
+=G3r2
 -----END PGP SIGNATURE-----
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
 }