Bump for a fixed init script, #196647

Package-Manager: portage-2.1.3.16
RepoMan-Options: --force

5 files changed, 106 insertions, 11 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/Manifest b/net-wireless/ipw3945d/Manifest
index 5ec689a69aa3..69a4313c1b7c 100644
--- a/net-wireless/ipw3945d/Manifest
+++ b/net-wireless/ipw3945d/Manifest
@@ -10,10 +10,10 @@ AUX ipw3945d-conf.d 174 RMD160 51a5c4cd892da514c00f80b952936bec90cbdb9b SHA1 d4a
 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 894 RMD160 f54628124c730185f39d7940e41977cd51d371c7 SHA1 7d38032907f913285baff26e95c0cca4019e5505 SHA256 7d5f292c2e599b4da710eba546d25d33ef2c0e71ce1e558f62357d08fdeefbec
-MD5 cdcb92ca566acad1dc0266d06f352859 files/ipw3945d-init.d 894
-RMD160 f54628124c730185f39d7940e41977cd51d371c7 files/ipw3945d-init.d 894
-SHA256 7d5f292c2e599b4da710eba546d25d33ef2c0e71ce1e558f62357d08fdeefbec files/ipw3945d-init.d 894
+AUX ipw3945d-init.d 934 RMD160 0b788be0d3e6e836035b91841efb5189306520a4 SHA1 a5ab549618766dc16fa6b4cee880e9ef398c2b78 SHA256 745090f05b6202592b85ab3bc6e0747b1ea6f50c194546b03f7ed9b42d9e3ca0
+MD5 13f51843076b746c505f7ca5d54bad55 files/ipw3945d-init.d 934
+RMD160 0b788be0d3e6e836035b91841efb5189306520a4 files/ipw3945d-init.d 934
+SHA256 745090f05b6202592b85ab3bc6e0747b1ea6f50c194546b03f7ed9b42d9e3ca0 files/ipw3945d-init.d 934
 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
@@ -24,10 +24,14 @@ EBUILD ipw3945d-1.7.22-r4.ebuild 2193 RMD160 b4b9869d2a1a4b17b5fc92cb4a40155c166
 MD5 a69faaee74f02f0c3747a4a4ab12b30d ipw3945d-1.7.22-r4.ebuild 2193
 RMD160 b4b9869d2a1a4b17b5fc92cb4a40155c16636682 ipw3945d-1.7.22-r4.ebuild 2193
 SHA256 1827c2e841d5d82763e09b3c437feb7f103e9dc7d351d47efbd205605724dc8f ipw3945d-1.7.22-r4.ebuild 2193
-MISC ChangeLog 4000 RMD160 a51f5edb15ad7cad29daaeef9cdad4883588473b SHA1 fb2c5a986436f8e87def68ddf4ec31e3be5c4264 SHA256 d352b6ed1215554bf861237531d25cde49442535b704c450c2bd8b40bb84832c
-MD5 b4f023130069292ee7a2612c1dbb5d49 ChangeLog 4000
-RMD160 a51f5edb15ad7cad29daaeef9cdad4883588473b ChangeLog 4000
-SHA256 d352b6ed1215554bf861237531d25cde49442535b704c450c2bd8b40bb84832c ChangeLog 4000
+EBUILD ipw3945d-1.7.22-r5.ebuild 2195 RMD160 f5d8029add405b3912940f85c47f6a36761410f4 SHA1 2066f1e93a01d614bb7e6b06130a0946889aac46 SHA256 36da9ac7ea7ef70bed3aa6e4c47d39c486959995145f2672b037dd21b375f822
+MD5 8c6c48be960366463c22b58ee8a81514 ipw3945d-1.7.22-r5.ebuild 2195
+RMD160 f5d8029add405b3912940f85c47f6a36761410f4 ipw3945d-1.7.22-r5.ebuild 2195
+SHA256 36da9ac7ea7ef70bed3aa6e4c47d39c486959995145f2672b037dd21b375f822 ipw3945d-1.7.22-r5.ebuild 2195
+MISC ChangeLog 4180 RMD160 288d985c9d4cff59b233ca5b7f6db52fd9927bef SHA1 122d5db2041906f8754a652a6ae8686f5f962f03 SHA256 d49cc5c6b3bd0eed923d09b73a66f063b99f13a132ca731a0bb80d9ea1e581d1
+MD5 e4f2f2974e5cbcf13936f93af0aea532 ChangeLog 4180
+RMD160 288d985c9d4cff59b233ca5b7f6db52fd9927bef ChangeLog 4180
+SHA256 d49cc5c6b3bd0eed923d09b73a66f063b99f13a132ca731a0bb80d9ea1e581d1 ChangeLog 4180
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -38,3 +42,6 @@ SHA256 cf1c91d1007504f5268819d03437d98f6e69074774c103ecb21499679545ea28 files/di
 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
+MD5 ae33038ba8fb0fa9459840b6c2297bdf files/digest-ipw3945d-1.7.22-r5 235
+RMD160 aaa0b90f60b64d0cd78e90c766ffbfb34deae0c8 files/digest-ipw3945d-1.7.22-r5 235
+SHA256 30e8b00331f05d9b8ac248847e70de1a7af8a1ea520bb1fea3faf301607f0345 files/digest-ipw3945d-1.7.22-r5 235
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!"
+}