Bug 214026: Moved modprobe file from /etc/modules.d/ to /etc/modprobe.d/

Package-Manager: portage-2.1.4.4

3 files changed, 87 insertions, 3 deletions

diff --git a/net-wireless/ipw3945d/ChangeLog b/net-wireless/ipw3945d/ChangeLog
index 13eba8dc3db8..65666a522ee7 100644
--- a/net-wireless/ipw3945d/ChangeLog
+++ b/net-wireless/ipw3945d/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2007/11/05 21:15:00 lack Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945d/ChangeLog,v 1.22 2008/03/21 12:52:20 lack Exp $
+
+*ipw3945d-1.7.22-r6 (21 Mar 2008)
+
+  21 Mar 2008; Jim Ramsay <lack@gentoo.org> +ipw3945d-1.7.22-r6.ebuild:
+  Bug 214026: Moved modprobe file from /etc/modules.d/ to /etc/modprobe.d/
 
   05 Nov 2007; Jim Ramsay <lack@gentoo.org> metadata.xml:
   Changing maintainers to myself, dang, and jkt
diff --git a/net-wireless/ipw3945d/Manifest b/net-wireless/ipw3945d/Manifest
index 49fcc166c41d..d399a1f0e1d1 100644
--- a/net-wireless/ipw3945d/Manifest
+++ b/net-wireless/ipw3945d/Manifest
@@ -7,5 +7,6 @@ DIST ipw3945d-1.7.22.tgz 59936 RMD160 26c1e602f7f33f8eb8856256a35c59db308c8f17 S
 EBUILD ipw3945d-1.7.18.ebuild 944 RMD160 1c045ed1e26007dfb26156593ce79a934ba0da61 SHA1 e8a830525df410088877c26632093f0676f49df5 SHA256 4bfc0eed9604fcbe7c9488fbadb16c57df582747e86aab135995c9b05712e6cf
 EBUILD ipw3945d-1.7.22-r4.ebuild 2193 RMD160 b4b9869d2a1a4b17b5fc92cb4a40155c16636682 SHA1 22f9ac7a3790b5a97369a744591544f22346e1b9 SHA256 1827c2e841d5d82763e09b3c437feb7f103e9dc7d351d47efbd205605724dc8f
 EBUILD ipw3945d-1.7.22-r5.ebuild 2195 RMD160 f5d8029add405b3912940f85c47f6a36761410f4 SHA1 2066f1e93a01d614bb7e6b06130a0946889aac46 SHA256 36da9ac7ea7ef70bed3aa6e4c47d39c486959995145f2672b037dd21b375f822
-MISC ChangeLog 4385 RMD160 0248428d34795aa1492c573276baf430488710b0 SHA1 e3abcd47031d2ca3fcc2800d8014c2228c6aa4d6 SHA256 38d36be703243591976facdd0b81a50a5e83d347ac318befe03d5ca16615f378
+EBUILD ipw3945d-1.7.22-r6.ebuild 2196 RMD160 62ec999d924d422d74115fce8948710679dd0638 SHA1 8ae1c64dc355b0a87b76f4d80f3e9665ddad6fad SHA256 cda051a80b12cd11477c741cb68100dc930fdf9585e5dd913fb267745b65134c
+MISC ChangeLog 4568 RMD160 372b17bc0ee4b9f14919c53d4d95c7b64ea3018d SHA1 4dd01b0ce591aa369080ff1b161ff6989e1c5740 SHA256 e28bcdf694db253d8470fc6f88f2692d741b6e5dbf86300b727bcd5ad2d8785b
 MISC metadata.xml 472 RMD160 a1abc57734ad8b295b6a4396edd7a45a6b27eecb SHA1 4938eeb6b377f59dc585c22a5d671db7cb590143 SHA256 29d7cca82850751f863570d26bc7b32a931c31344641651f04c4ce921c3d90de
diff --git a/net-wireless/ipw3945d/ipw3945d-1.7.22-r6.ebuild b/net-wireless/ipw3945d/ipw3945d-1.7.22-r6.ebuild
new file mode 100644
index 000000000000..6913618ec387
--- /dev/null
+++ b/net-wireless/ipw3945d/ipw3945d-1.7.22-r6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 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-r6.ebuild,v 1.1 2008/03/21 12:52:20 lack 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/modprobe.d
+	newins "${FILESDIR}/${P}-modprobe.conf" ${PN}
+
+	dodoc README.${PN}
+}
+
+pkg_postinst() {
+	# Update the modprobe.d cache
+	if [ "${ROOT}" = "/" ] && [ -f "${ROOT}/etc/modprobe.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!"
+}