Replace udev file prefix 00 with 99 (#233498).

Package-Manager: portage-2.1.4.4

4 files changed, 198 insertions, 5 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index 0dbbd0af3bd8..f0083834afc9 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,12 @@
 # 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.49 2008/08/01 21:32:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.50 2008/09/25 20:44:02 mrness Exp $
+
+*hsfmodem-7.68.00.13 (25 Sep 2008)
+
+  25 Sep 2008; Alin Năstac <mrness@gentoo.org>
+  +files/hsfmodem-7.68.00.13-gentoo.patch, +hsfmodem-7.68.00.13.ebuild:
+  Replace udev file prefix 00 with 99 (#233498).
 
 *hsfmodem-7.68.00.12 (30 Jul 2008)
 
diff --git a/net-dialup/hsfmodem/Manifest b/net-dialup/hsfmodem/Manifest
index 9653a71b53b1..d9467365d118 100644
--- a/net-dialup/hsfmodem/Manifest
+++ b/net-dialup/hsfmodem/Manifest
@@ -3,19 +3,23 @@ Hash: SHA1
 
 AUX hsfmodem-7.68.00.09-gentoo.patch 1570 RMD160 e9e60ded13fea2fefd057fc97c9b24fb9e7e0bb2 SHA1 73428460ec1afc359971bf120966141061f39413 SHA256 16507783f89fcbe625b370adb13f552aa26b939b5c3ef10c3d893cf3649f4bda
 AUX hsfmodem-7.68.00.12-gentoo.patch 3028 RMD160 50ac17ea33386316b965d78e50f7199e51f65e39 SHA1 662b73e19928d8b587c5bd7c05fd485330ce293b SHA256 2e4a514651568bbff5cd447761c51e3a87d0e98737e7827e53e2af06507d40a4
+AUX hsfmodem-7.68.00.13-gentoo.patch 3089 RMD160 efffe47e3d194bded0c76f2c3e6445122cba744f SHA1 b4d7c9a66f43fa604a5bcc3e65c8ab2e99c74354 SHA256 0303a348e452ee965a3677337fe69ba1eea82e49e3cfcbc4e0c9deaf8c439e12
 DIST 100498D_RM_HxF_Released.pdf 718949 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a SHA1 519c9b064e734873d67cf9c17d8eb1389a6f4eef SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
 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
 DIST hsfmodem-7.68.00.12full.tar.gz 1468875 RMD160 fb6a1cfb60478b858f9f2393f54de0d43eef812c SHA1 69bfde1db7d2d52877c99346d9462afb753724e0 SHA256 e3af53751c6eeed971f492a1739181901425ea4139ce4b599f57b46cb903660d
 DIST hsfmodem-7.68.00.12x86_64full.tar.gz 1596301 RMD160 8ed28c09410188649db5babf0ca768ed4ab5f01d SHA1 8a2f0ad14381c8f17ab38e63226c8dc2d253f6b6 SHA256 b02ec83047c1b8cd15274c41d2db198a4a8f46b5b233fdc75203e2db7270ac10
+DIST hsfmodem-7.68.00.13full.tar.gz 1469155 RMD160 2226b57b7251bfb0af102ee13e59a2e1efb0736f SHA1 e7e47c1daa3d36ce6a0074f5167b7cb7562bcf9f SHA256 5779369e2bc368dfb9188773c9405025f3bcffd31a79ee6c8a101d5181d114a8
+DIST hsfmodem-7.68.00.13x86_64full.tar.gz 1596695 RMD160 b4a496826a2955483139d1d653a8a4933bd0d0d9 SHA1 3d365894669fad10c0a38c52b34e7dbab0437767 SHA256 b4441715c45a563d7638ae1f7eb6b7412b864198148cb71eafa319d1fdbef957
 EBUILD hsfmodem-7.68.00.09.ebuild 2089 RMD160 1dd99a36db9f126a27e2367b4609bd4124b1c524 SHA1 595e4846dc6c5330d41d46aa555682dd422f39aa SHA256 f913355bf18f63e6ee8da4d3e3a709d18d90116d24afac907f18ab7a13b122fb
 EBUILD hsfmodem-7.68.00.12.ebuild 2091 RMD160 fdb46267f0d0e7fad78d59556898da0388c5a79b SHA1 d5e353cd7222de689f9558d00845d416090988f6 SHA256 c5180e5da4839a6c63ae5726264ab5920e2ec4b435ec1b6995552e7342a879c1
-MISC ChangeLog 11630 RMD160 c9974f496c4a8ab1c7901e8d0b11c862ecf91189 SHA1 502a74acffbd33ce917194ec6f76a4a5ff9c574b SHA256 23f8a0dd42c9a1acff1c7264d72301a769f772ac4fc03cc16efa262778fcecba
+EBUILD hsfmodem-7.68.00.13.ebuild 2091 RMD160 a861d3ba29872e5d116e5ad1037327554b081f46 SHA1 f6c3f6fc5d27b47a332054d19b8392d95bd8783f SHA256 5169b1b16fe2f80b8a52fbcbd7c63eb64eb5f6b6bb6f9020d574ab701ca92e59
+MISC ChangeLog 11836 RMD160 764621dd7b0123d2901ce418b96be194e3f99a6d SHA1 dc419fd7e33e061fa54d28cf797c47f7e9dd7431 SHA256 22b3ecc66475835b0e6d3b31885d232134915b066e8efefb88e949a8a7e52114
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjZSiEACgkQPrHvTlXvhtsbrACfcWbieYF0c3BvA1mfJBGUtlKH
-stoAn2mGUT+IpydyASpK8DYPcyXbIKLh
-=ReS4
+iEYEARECAAYFAkjb+B8ACgkQPrHvTlXvhtu1MwCfcXSTEizfymAF4D5OJkfACafs
+hUUAn2VkqCXTQxWttXJh+mqYbbAwnpVM
+=s/nV
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..9e0480c20a02
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.68.00.13-gentoo.patch
@@ -0,0 +1,101 @@
+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/hsfmodem-7.68.00.13.ebuild b/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild
new file mode 100644
index 000000000000..8c2dca8b6640
--- /dev/null
+++ b/net-dialup/hsfmodem/hsfmodem-7.68.00.13.ebuild
@@ -0,0 +1,82 @@
+# 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
+}