Implementing the changes Jan Kundrat provided, many thanks to him.

Package-Manager: portage-2.1.2_rc3-r6

4 files changed, 32 insertions, 24 deletions

diff --git a/net-wireless/ipw3945d/ChangeLog b/net-wireless/ipw3945d/ChangeLog
index fdd7113053e2..7ad87460ed37 100644
--- a/net-wireless/ipw3945d/ChangeLog
+++ b/net-wireless/ipw3945d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ipw3945d
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.8 2006/12/17 19:52:19 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.9 2006/12/17 21:46:35 phreak Exp $
+
+  17 Dec 2006; Christian Heim <phreak@gentoo.org> files/ipw3945d-conf.d,
+  ipw3945d-1.7.22-r4.ebuild:
+  Implementing the changes Jan Kundrat provided, many thanks to him.
 
 *ipw3945d-1.7.22-r4 (17 Dec 2006)
 
diff --git a/net-wireless/ipw3945d/Manifest b/net-wireless/ipw3945d/Manifest
index 4a7cfe92911c..a28e57254292 100644
--- a/net-wireless/ipw3945d/Manifest
+++ b/net-wireless/ipw3945d/Manifest
@@ -9,10 +9,10 @@ AUX ipw3945d-1.7.22-modprobe.conf 179 RMD160 c00d1cd93e7020b8de32b0ff9e3595ff4fc
 MD5 85674a483b5a461fbb3917a8d512ba42 files/ipw3945d-1.7.22-modprobe.conf 179
 RMD160 c00d1cd93e7020b8de32b0ff9e3595ff4fce42d3 files/ipw3945d-1.7.22-modprobe.conf 179
 SHA256 c65bbaa125566ea1f8a07d4d61088c5880fa0ae37f4f15c087570780c3b4ae4b files/ipw3945d-1.7.22-modprobe.conf 179
-AUX ipw3945d-conf.d 166 RMD160 c1bfc30ecc9aab7a399830eb851d153b82bdb0d0 SHA1 a99cca3eee91a37958566d789bd6b0f118292e56 SHA256 a549ac7fdfd47b10ccb667d1e5785a5077501ee0b3c2ed8fc463b2f5a02e7767
-MD5 c78a3f8437d725ef4793f28dde079fb4 files/ipw3945d-conf.d 166
-RMD160 c1bfc30ecc9aab7a399830eb851d153b82bdb0d0 files/ipw3945d-conf.d 166
-SHA256 a549ac7fdfd47b10ccb667d1e5785a5077501ee0b3c2ed8fc463b2f5a02e7767 files/ipw3945d-conf.d 166
+AUX ipw3945d-conf.d 174 RMD160 51a5c4cd892da514c00f80b952936bec90cbdb9b SHA1 d4adcbbb28188f932cd4627c0cba6e4bc49ee2b5 SHA256 d7c4588328f22779016823724b3157f603f9747c9b4d77a1f15e83cabd1a7091
+MD5 97d349b235ca84011032f501cfd65a92 files/ipw3945d-conf.d 174
+RMD160 51a5c4cd892da514c00f80b952936bec90cbdb9b files/ipw3945d-conf.d 174
+SHA256 d7c4588328f22779016823724b3157f603f9747c9b4d77a1f15e83cabd1a7091 files/ipw3945d-conf.d 174
 AUX ipw3945d-init.d 913 RMD160 adabd1db370f37d2979af98fbe149af32e344da8 SHA1 34b96d31adedb63f7aa8523060e9d880f1ac2a4f SHA256 9c38e8650fc395b4cde962e0b5c849d71feab367bb4ef4ce24f2d711bf1b6977
 MD5 ff790c2cee9de5726838e0fcc68bd1d3 files/ipw3945d-init.d 913
 RMD160 adabd1db370f37d2979af98fbe149af32e344da8 files/ipw3945d-init.d 913
@@ -27,14 +27,14 @@ EBUILD ipw3945d-1.7.22-r3.ebuild 1229 RMD160 81c175c0a1e148f3e8bfc66a1dee42679fb
 MD5 1f674bd98221174879e495f61368425a ipw3945d-1.7.22-r3.ebuild 1229
 RMD160 81c175c0a1e148f3e8bfc66a1dee42679fb10dfb ipw3945d-1.7.22-r3.ebuild 1229
 SHA256 e9431dae512c92104a51ecdeb1766575a324b3bb9d46ba0d95d6e76dcadd86f0 ipw3945d-1.7.22-r3.ebuild 1229
-EBUILD ipw3945d-1.7.22-r4.ebuild 1293 RMD160 53edee06079bebed8148c51ec4857739fe14ea62 SHA1 a56445331f4bef34292237166693fffef967bbbb SHA256 fc967db203ae9c2cd9b442566e5d3102b6fa55e4efec1bb0be2c480ecc48d6f3
-MD5 a96e221fda8b3c2d43737f31be4488e0 ipw3945d-1.7.22-r4.ebuild 1293
-RMD160 53edee06079bebed8148c51ec4857739fe14ea62 ipw3945d-1.7.22-r4.ebuild 1293
-SHA256 fc967db203ae9c2cd9b442566e5d3102b6fa55e4efec1bb0be2c480ecc48d6f3 ipw3945d-1.7.22-r4.ebuild 1293
-MISC ChangeLog 2060 RMD160 17a87ef4a212f0381c4b67620c49740c037df0b5 SHA1 4f6e7cbc0d7315feefc66b388c9e7c9fae7ed2f4 SHA256 4c1e1be2b945259bafd6dd4fd62fec57d32dc6bbbab99ea7e1df89bfcb2c690a
-MD5 8e54f8b3bdb06221f662f5c6ae141f6d ChangeLog 2060
-RMD160 17a87ef4a212f0381c4b67620c49740c037df0b5 ChangeLog 2060
-SHA256 4c1e1be2b945259bafd6dd4fd62fec57d32dc6bbbab99ea7e1df89bfcb2c690a ChangeLog 2060
+EBUILD ipw3945d-1.7.22-r4.ebuild 1389 RMD160 3c9a0aadf2296d070c476983132e3b25cee8007d SHA1 eb0f85ed42ac20cde60f9d8948af49efb37fadfd SHA256 906b599a42908156eb4e383308863cb7203917047ae2c383ad83f143641a307c
+MD5 26594518b951e8e9ff6c7d77cddae694 ipw3945d-1.7.22-r4.ebuild 1389
+RMD160 3c9a0aadf2296d070c476983132e3b25cee8007d ipw3945d-1.7.22-r4.ebuild 1389
+SHA256 906b599a42908156eb4e383308863cb7203917047ae2c383ad83f143641a307c ipw3945d-1.7.22-r4.ebuild 1389
+MISC ChangeLog 2232 RMD160 81726174d687044790f00ce2a373466e64ee53d3 SHA1 4e95dc9fc1d1255983c9d246c02b0eaba1883d7b SHA256 543e5c2f9011b1868a178d0b8315fbf83fdb70972462e993a5ab8c1df51a87a9
+MD5 8bb72408857d8f9c3d8378aff701140f ChangeLog 2232
+RMD160 81726174d687044790f00ce2a373466e64ee53d3 ChangeLog 2232
+SHA256 543e5c2f9011b1868a178d0b8315fbf83fdb70972462e993a5ab8c1df51a87a9 ChangeLog 2232
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -51,7 +51,7 @@ SHA256 30e8b00331f05d9b8ac248847e70de1a7af8a1ea520bb1fea3faf301607f0345 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFhZ/+yuNVb5qfaOYRAn25AKDD2EmydW0U1Cpn+IsV6W3oeXsuQwCcDQkp
-5+7ySyo2cildG1Wrhfy8akI=
-=noZd
+iD8DBQFFhbrbyuNVb5qfaOYRAhiWAKDRY5WttkI7S8wDjdaSr8+1oz4iogCeOU12
+HX0eY3sPkMJbaNDK/9srRqU=
+=Tjhf
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ipw3945d/files/ipw3945d-conf.d b/net-wireless/ipw3945d/files/ipw3945d-conf.d
index 571d42d65928..03cb1fcc79ce 100644
--- a/net-wireless/ipw3945d/files/ipw3945d-conf.d
+++ b/net-wireless/ipw3945d/files/ipw3945d-conf.d
@@ -2,4 +2,4 @@
 
 # Arguments to be passed to ipw3945d. See 'ipw3945d --help' for more
 # information.
-ARGS="--timeout=-1"
+ARGS="--timeout=-1 --quiet"
diff --git a/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild b/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild
index 0817c7efd690..583385f76f33 100644
--- a/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild
+++ b/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild,v 1.1 2006/12/17 19:52:19 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild,v 1.2 2006/12/17 21:46:35 phreak Exp $
 
 inherit eutils
 
@@ -12,6 +12,10 @@ LICENSE="ipw3945"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+# The daemon is binary only, is setXid, dyn linked,
+# and using lazy bindings
+RESTRICT="stricter"
+
 IUSE=""
 DEPEND=""
 
@@ -25,6 +29,10 @@ src_install() {
 	use x86 && dosbin x86/ipw3945d
 	use amd64 && dosbin x86_64/ipw3945d
 
+	# Give the ipw3945d access to the binary
+	fowners ipw3945d:root /sbin/ipw3945d
+	fperms 04450 /sbin/ipw3945d
+
 	keepdir /var/run/ipw3945d
 	fowners ipw3945d:root /var/run/ipw3945d
 
@@ -42,10 +50,6 @@ pkg_postinst() {
 	if [ -f "${ROOT}/etc/modules.d/${PN}" ] ; then
 		${ROOT}/sbin/modules-update --force
 	fi
-	einfo
-	einfo "The ipw3945d is now started using an init script. To automatically have"
-	einfo "it started, you need to add it to the boot run level as shown below:"
-	einfo
-	einfo "  # rc-update add ${PN} default"
-	einfo
+	einfo "The ipw3945 daemon is now started by udev. The daemon should be"
+	einfo "brought up automatically."
 }