Revision bump, hopefully fixing some of the bugs introduced by ripping of Hendrik's modprobe.conf files.

(Portage version: 2.1.2_rc3-r6)

6 files changed, 80 insertions, 4 deletions

diff --git a/net-wireless/ipw3945d/ChangeLog b/net-wireless/ipw3945d/ChangeLog
index 98b94f9317d4..fdd7113053e2 100644
--- 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/files/digest-ipw3945d-1.7.22-r4 b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r4
new file mode 100644
index 000000000000..92883c1f4f53
--- /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
index 000000000000..74e3262dc7ae
--- /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 03cb1fcc79ce..571d42d65928 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 --quiet"
+ARGS="--timeout=-1"
diff --git a/net-wireless/ipw3945d/files/ipw3945d-init.d b/net-wireless/ipw3945d/files/ipw3945d-init.d
index 75bd469a9979..e691710ad740 100644
--- 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
index 000000000000..0817c7efd690
--- /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
+}