Revision bump, hopefully fixing some of the bugs introduced by ripping of Hendrik...

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/net-wireless/ipw3945d/ChangeLog b/net-wireless/ipw3945d/ChangeLog
index 98b94f9317d475c7c361418cdc66399fc14ad8ce..fdd7113053e2826445fee1e936d5880499ee2037 100644 (file)
--- a/net-wireless/ipw3945d/ChangeLog
+++ b/net-wireless/ipw3945d/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2006/12/07 19:47:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.8 2006/12/17 19:52:19 phreak Exp $
+
+*ipw3945d-1.7.22-r4 (17 Dec 2006)
+
+  17 Dec 2006; Christian Heim <phreak@gentoo.org> files/ipw3945d-conf.d,
+  +files/ipw3945d-1.7.22-modprobe.conf, files/ipw3945d-init.d,
+  +ipw3945d-1.7.22-r4.ebuild:
+  Revision bump, hopefully fixing some of the bugs introduced by ripping of
+  Hendrik's modprobe.conf files.
 
   07 Dec 2006; Christian Heim <phreak@gentoo.org> metadata.xml:
   Adding Seemant as secondary maintainer.

diff --git a/net-wireless/ipw3945d/Manifest b/net-wireless/ipw3945d/Manifest
index aba64037f974d5208431eabeb96dd32087618083..4a7cfe92911c9607e26e49aa0ffac37538501a24 100644 (file)
--- a/net-wireless/ipw3945d/Manifest
+++ b/net-wireless/ipw3945d/Manifest
@@ -5,14 +5,18 @@ AUX ipw3945d-1.7.18-modprobe.conf 171 RMD160 77fb16f6a032de201dbcc05df60ed1d4402
 MD5 d7554e7f05ae1b034ce6b9629e8f40c8 files/ipw3945d-1.7.18-modprobe.conf 171
 RMD160 77fb16f6a032de201dbcc05df60ed1d44025cc94 files/ipw3945d-1.7.18-modprobe.conf 171
 SHA256 f7a0c626a87f2a568dd218db1e8e9d821ba81d2969a7de457bf825a72bdf8c00 files/ipw3945d-1.7.18-modprobe.conf 171
-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 587 RMD160 c41c1ba627f4dc7e60642bfbd39aa17d1fef5ac6 SHA1 1b2879bee4e52d274635f8ba7362352e364d5d11 SHA256 6a37fc25aa8812b9389cc5a5ab9a961e88d5e7deee68d26518cbb16a5d4b389e
-MD5 cd0b7a0ed3b5003c649c438a7a846ebd files/ipw3945d-init.d 587
-RMD160 c41c1ba627f4dc7e60642bfbd39aa17d1fef5ac6 files/ipw3945d-init.d 587
-SHA256 6a37fc25aa8812b9389cc5a5ab9a961e88d5e7deee68d26518cbb16a5d4b389e files/ipw3945d-init.d 587
+AUX ipw3945d-1.7.22-modprobe.conf 179 RMD160 c00d1cd93e7020b8de32b0ff9e3595ff4fce42d3 SHA1 7960e209880f445a4b2c64d9eaf874425ab63c10 SHA256 c65bbaa125566ea1f8a07d4d61088c5880fa0ae37f4f15c087570780c3b4ae4b
+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-init.d 913 RMD160 adabd1db370f37d2979af98fbe149af32e344da8 SHA1 34b96d31adedb63f7aa8523060e9d880f1ac2a4f SHA256 9c38e8650fc395b4cde962e0b5c849d71feab367bb4ef4ce24f2d711bf1b6977
+MD5 ff790c2cee9de5726838e0fcc68bd1d3 files/ipw3945d-init.d 913
+RMD160 adabd1db370f37d2979af98fbe149af32e344da8 files/ipw3945d-init.d 913
+SHA256 9c38e8650fc395b4cde962e0b5c849d71feab367bb4ef4ce24f2d711bf1b6977 files/ipw3945d-init.d 913
 DIST ipw3945d-1.7.18.tgz 57929 RMD160 3d4d4830c78b4124631d5d4cc9e91417630df810 SHA1 838418cffa6706a214d16e43ab3595e193fbbe6a SHA256 aa43ee86df58350a7c864ecba59d7c5e888058311fb782e325e783901955b83d
 DIST ipw3945d-1.7.22.tgz 59936 RMD160 26c1e602f7f33f8eb8856256a35c59db308c8f17 SHA1 6e97908ea12e41bc97a2b715e9dc887e894df9a6 SHA256 d2cb513b8cedc1515a9c5a4a367aa7869bf2cc644019ebe0737cb13384ef9397
 EBUILD ipw3945d-1.7.18.ebuild 944 RMD160 1c045ed1e26007dfb26156593ce79a934ba0da61 SHA1 e8a830525df410088877c26632093f0676f49df5 SHA256 4bfc0eed9604fcbe7c9488fbadb16c57df582747e86aab135995c9b05712e6cf
@@ -23,10 +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
-MISC ChangeLog 1749 RMD160 ef2b48803d81fc8d548fd49d7fbd2e86b0fc0d17 SHA1 67b732ea89b2e3bf0728f776f0e118cb244d7d1b SHA256 77019f3a45e3830ddf662f04ff273ffd6101a3114cf4c2cc2491fca5cd2a1cb8
-MD5 5d2201a201e7af5677c9a1cbd68ba52d ChangeLog 1749
-RMD160 ef2b48803d81fc8d548fd49d7fbd2e86b0fc0d17 ChangeLog 1749
-SHA256 77019f3a45e3830ddf662f04ff273ffd6101a3114cf4c2cc2491fca5cd2a1cb8 ChangeLog 1749
+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
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -37,10 +45,13 @@ SHA256 cf1c91d1007504f5268819d03437d98f6e69074774c103ecb21499679545ea28 files/di
 MD5 ae33038ba8fb0fa9459840b6c2297bdf files/digest-ipw3945d-1.7.22-r3 235
 RMD160 aaa0b90f60b64d0cd78e90c766ffbfb34deae0c8 files/digest-ipw3945d-1.7.22-r3 235
 SHA256 30e8b00331f05d9b8ac248847e70de1a7af8a1ea520bb1fea3faf301607f0345 files/digest-ipw3945d-1.7.22-r3 235
+MD5 ae33038ba8fb0fa9459840b6c2297bdf files/digest-ipw3945d-1.7.22-r4 235
+RMD160 aaa0b90f60b64d0cd78e90c766ffbfb34deae0c8 files/digest-ipw3945d-1.7.22-r4 235
+SHA256 30e8b00331f05d9b8ac248847e70de1a7af8a1ea520bb1fea3faf301607f0345 files/digest-ipw3945d-1.7.22-r4 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFeG/wyuNVb5qfaOYRAra2AKDRdS8lTOxmiYofACsaw8QzJKP/ewCgkHVX
-zD75WiPN1qBScyEXkBGxoro=
-=JGOv
+iD8DBQFFhZ/+yuNVb5qfaOYRAn25AKDD2EmydW0U1Cpn+IsV6W3oeXsuQwCcDQkp
+5+7ySyo2cildG1Wrhfy8akI=
+=noZd
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r4 b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r4
new file mode 100644 (file)
index 0000000..92883c1
--- /dev/null
+++ b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r4
@@ -0,0 +1,3 @@
+MD5 a8404cb63de7493d1405d5132ea02823 ipw3945d-1.7.22.tgz 59936
+RMD160 26c1e602f7f33f8eb8856256a35c59db308c8f17 ipw3945d-1.7.22.tgz 59936
+SHA256 d2cb513b8cedc1515a9c5a4a367aa7869bf2cc644019ebe0737cb13384ef9397 ipw3945d-1.7.22.tgz 59936

diff --git a/net-wireless/ipw3945d/files/ipw3945d-1.7.22-modprobe.conf b/net-wireless/ipw3945d/files/ipw3945d-1.7.22-modprobe.conf
new file mode 100644 (file)
index 0000000..74e3262
--- /dev/null
+++ b/net-wireless/ipw3945d/files/ipw3945d-1.7.22-modprobe.conf
@@ -0,0 +1,2 @@
+install ipw3945 /sbin/modprobe --ignore-install ipw3945; sleep 0.5; /etc/init.d/ipw3945d start
+remove ipw3945 /etc/init.d/ipw3945d stop; /sbin/modprobe -r --ignore-remove ipw3945

diff --git a/net-wireless/ipw3945d/files/ipw3945d-conf.d b/net-wireless/ipw3945d/files/ipw3945d-conf.d
index 03cb1fcc79cefbd860b5d9a538fbc3b6ee23ccfb..571d42d6592880899dde272c3ae95f93c760d736 100644 (file)
--- 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 --quiet"
+ARGS="--timeout=-1"

diff --git a/net-wireless/ipw3945d/files/ipw3945d-init.d b/net-wireless/ipw3945d/files/ipw3945d-init.d
index 75bd469a9979e44f316e7088f481aefeee1633dd..e691710ad740967b6c407f21d15ba2c5e2d4291a 100644 (file)
--- a/net-wireless/ipw3945d/files/ipw3945d-init.d
+++ b/net-wireless/ipw3945d/files/ipw3945d-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/files/ipw3945d-init.d,v 1.2 2006/09/09 07:53:40 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/files/ipw3945d-init.d,v 1.3 2006/12/17 19:52:19 phreak Exp $
 
 PIDFILE=/var/run/ipw3945d/ipw3945d.pid
 
@@ -9,8 +9,20 @@ depend() {
        before net
 }
 
+check() {
+       # Let's check if the pidfile is still present.
+       if [ -f "${PIDFILE}" ] ; then
+               eerror "The pidfile ($PIDFILE) is still present."
+               eerror "Please check that the daemon isn't running!"
+               exit 1
+       fi
+}
+
 start() {
+       check
        ebegin "Starting ipw3945d"
+       chown ipw3945d /sys/bus/pci/drivers/ipw3945/00*/cmd
+       chmod a-w,u+rw /sys/bus/pci/drivers/ipw3945/00*/cmd
        start-stop-daemon --start --exec /sbin/ipw3945d --pidfile ${PIDFILE} -- \
                --pid-file=${PIDFILE} ${ARGS}
        eend ${?}
@@ -18,6 +30,6 @@ start() {
 
 stop() {
        ebegin "Stopping ipw3945d"
-       start-stop-daemon --stop --exec /sbin/ipw3945 --pidfile ${PIDFILE}
+       start-stop-daemon --stop --exec /sbin/ipw3945d --pidfile ${PIDFILE}
        eend ${?}
 }

diff --git a/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild b/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild
new file mode 100644 (file)
index 0000000..0817c7e
--- /dev/null
+++ b/net-wireless/ipw3945d/ipw3945d-1.7.22-r4.ebuild
@@ -0,0 +1,51 @@
+# 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 $
+
+inherit eutils
+
+DESCRIPTION="Regulatory daemon for the Intel PRO/Wireless 3945ABG miniPCI express adapter"
+HOMEPAGE="http://www.bughost.org/ipw3945/"
+SRC_URI="http://www.bughost.org/ipw3945/daemon/${P}.tgz"
+
+LICENSE="ipw3945"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+DEPEND=""
+
+pkg_setup() {
+       # Create a user for the ipw3945d daemon
+       enewuser ipw3945d -1
+}
+
+src_install() {
+       into /
+       use x86 && dosbin x86/ipw3945d
+       use amd64 && dosbin x86_64/ipw3945d
+
+       keepdir /var/run/ipw3945d
+       fowners ipw3945d:root /var/run/ipw3945d
+
+       newconfd "${FILESDIR}/${PN}-conf.d" ${PN}
+       newinitd "${FILESDIR}/${PN}-init.d" ${PN}
+
+       insinto /etc/modules.d
+       newins "${FILESDIR}/${P}-modprobe.conf" ${PN}
+
+       dodoc README.${PN}
+}
+
+pkg_postinst() {
+       # Update the modules.d cache
+       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
+}