Bump for a fixed init script, #196647

(Portage version: 2.1.3.16, RepoMan options: --force)

4 files changed, 91 insertions, 3 deletions

diff --git a/net-wireless/ipw3945d/ChangeLog b/net-wireless/ipw3945d/ChangeLog
index e8024abaf0eb..ba2dd441ea8a 100644
--- a/net-wireless/ipw3945d/ChangeLog
+++ b/net-wireless/ipw3945d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw3945d
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.18 2007/06/03 05:19:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.19 2007/11/01 01:59:19 uberlord Exp $
+
+*ipw3945d-1.7.22-r5 (01 Nov 2007)
+
+  01 Nov 2007; Roy Marples <uberlord@gentoo.org> files/ipw3945d-init.d,
+  +ipw3945d-1.7.22-r5.ebuild:
+  Bump for a fixed init script, #196647
 
   03 Jun 2007; Doug Goldstein <cardoe@gentoo.org> files/ipw3945d-init.d:
   s-s-d start was wrong.
diff --git a/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r5 b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r5
new file mode 100644
index 000000000000..92883c1f4f53
--- /dev/null
+++ b/net-wireless/ipw3945d/files/digest-ipw3945d-1.7.22-r5
@@ -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-init.d b/net-wireless/ipw3945d/files/ipw3945d-init.d
index 6f3c991af828..d4d4cb665f87 100644
--- a/net-wireless/ipw3945d/files/ipw3945d-init.d
+++ b/net-wireless/ipw3945d/files/ipw3945d-init.d
@@ -1,12 +1,13 @@
 #!/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.5 2007/06/03 05:19:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/files/ipw3945d-init.d,v 1.6 2007/11/01 01:59:20 uberlord Exp $
 
 PIDFILE=/var/run/ipw3945d/ipw3945d.pid
 
 depend() {
 	before net
+	need localmount
 }
 
 check() {
@@ -23,7 +24,7 @@ start() {
 	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 -- \
+	start-stop-daemon --start --exec /sbin/ipw3945d --pidfile ${PIDFILE} -- \
 		--pid-file=${PIDFILE} ${ARGS}
 	eend ${?}
 }
diff --git a/net-wireless/ipw3945d/ipw3945d-1.7.22-r5.ebuild b/net-wireless/ipw3945d/ipw3945d-1.7.22-r5.ebuild
new file mode 100644
index 000000000000..cd39c8e7ca1a
--- /dev/null
+++ b/net-wireless/ipw3945d/ipw3945d-1.7.22-r5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2007 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-r5.ebuild,v 1.1 2007/11/01 01:59:19 uberlord 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=""
+
+RESTRICT="strip"
+
+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
+
+	# 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
+
+	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 [ "${ROOT}" = "/" ] && [ -f "${ROOT}/etc/modules.d/${PN}" ] ; then
+		ebegin "Updating modules.conf"
+		[ -x /sbin/update-modules ] && /sbin/update-modules --force || /sbin/modules-update --force
+		eend $?
+	fi
+
+	echo
+
+	# These nasty live-filesystem fixes are needed, because if the files are
+	# already there, the permissions applied in src_install() won't get
+	# merged to the live filesystem. Once portage is fixed with regard to
+	# this, these hacks can go away.
+
+	# Fix the permissions of /sbin/ipw3945d
+	ebegin "Fixing permissions of ${ROOT}sbin/ipw3945d"
+	chown ipw3945d:root "${ROOT}sbin/ipw3945d"
+	chmod 04450 "${ROOT}sbin/ipw3945d"
+	eend $?
+
+	# Fixing ownership of /var/run/ipw3945d
+	ebegin "Fixing ownership of ${ROOT}var/run/ipw3945d"
+	chown ipw3945d:root "${ROOT}var/run/ipw3945d"
+	eend $?
+
+	echo
+
+	einfo "The ipw3945 daemon is now started by udev. The daemon should be"
+	einfo "brought up automatically once you reboot. Also make sure when you"
+	einfo "update from a previous version, you need to reboot in order to"
+	einfo "replace an existing version of this daemon!"
+}