Bump. Includes fixes from bug #45331.

5 files changed, 115 insertions, 2 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index c8a4f514d6fe..839e703b89d4 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.3 2004/03/25 04:47:06 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.4 2004/03/30 03:46:13 latexer Exp $
+
+*ndiswrapper-0.6-r1 (29 Mar 2004)
+
+  29 Mar 2004; Peter Johanson <latexer@gentoo.org> ndiswrapper-0.6-r1.ebuild,
+  files/ndiswrapper-0.6-modules.d:
+  Bump, includes fixes from bug #45331 for module loading stuff. Thanks to
+  Juergen Nagel <juergen@nagel.homeip.net> for the changes.
 
 *ndiswrapper-0.6 (24 Mar 2004)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 437481f4350a..a2252968bd69 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,9 +1,12 @@
 MD5 1dd212dbb9fadf2c24d4eba85e8d0032 ndiswrapper-0.5.ebuild 3316
 MD5 d97fdf7368bef13561b132bbf887b7fc ndiswrapper-0.4.ebuild 3182
+MD5 fef93374d1cb7265c1c8a9e9504f243b ndiswrapper-0.6-r1.ebuild 1915
 MD5 0b3829ef957086a3d82be356b28048f9 ndiswrapper-0.6.ebuild 3316
 MD5 92cf89acd901e8374e504fcdb62c7b0d ndiswrapper-0.3.ebuild 2856
-MD5 e74267f3763e6aa66ea99c092c607e26 ChangeLog 971
+MD5 7d657af89c27f01eab08c27fd48aab00 ChangeLog 1255
 MD5 0dfb45e6e16bf37b171169afca958121 metadata.xml 429
+MD5 e20c0dc4a4a29e344728d59de5757e3f files/ndiswrapper-0.6-modules.d 515
+MD5 fec18da2febe1a066f79d692b5e5eada files/digest-ndiswrapper-0.6-r1 66
 MD5 d5bd4c071015eef1d33281dd95f668e7 files/digest-ndiswrapper-0.3 66
 MD5 922f4572dd8899c80920a0aea4485be9 files/digest-ndiswrapper-0.4 66
 MD5 5a45570913b15b02817cfdfebbd02536 files/digest-ndiswrapper-0.5 66
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6-r1 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6-r1
new file mode 100644
index 000000000000..234ac0e4a729
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6-r1
@@ -0,0 +1 @@
+MD5 7eee09ad2a869efcff570ef064063654 ndiswrapper-0.6.tar.gz 65134
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-0.6-modules.d b/net-wireless/ndiswrapper/files/ndiswrapper-0.6-modules.d
new file mode 100644
index 000000000000..468a3621aa19
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-0.6-modules.d
@@ -0,0 +1,18 @@
+# Options for ndiswrapper.
+#
+
+# Set this alias to some device. Usually wlan0 unless you've got more than one
+# wireless card.
+
+#alias wlan0 ndiswrapper
+
+# loadndisdriver requires 4 parameters.
+# 
+# Uncomment the following line after you've replaced "REPLACE"
+# to the directory in /etc/ndiswrapper created by running with the path to the 
+# Windows(tm) .inf file:
+#
+# ndiswrapper -i somedriver.inf
+#
+
+#install ndiswrapper /sbin/modprobe --ignore-install ndiswrapper && { loadndisdriver /etc/ndiswrapper/REPLACE ; }
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.6-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.6-r1.ebuild
new file mode 100644
index 000000000000..3897d4f23170
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-0.6-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+inherit kernel-mod
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
+HOMEPAGE="http://ndiswrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="sys-devel/flex"
+
+src_unpack() {
+	check_KV
+	kernel-mod_getversion
+	unpack ${A}
+
+	# Fix path to kernel and KVERS
+	sed -i -e "s:^KSRC.*:KSRC=${ROOT}/usr/src/linux:" \
+		-e "s:^KVERS.*:KVERS=${KV_MAJOR}${KV_MINOR}:" \
+		${S}/driver/Makefile
+}
+
+src_compile() {
+	# Unset ARCH for 2.5/2.6 kernel compiles
+	unset ARCH
+	emake || die
+}
+
+src_install() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		KV_OBJ="ko"
+	else
+		KV_OBJ="o"
+	fi
+
+	dobin ${S}/utils/loadndisdriver
+	dobin ${S}/utils/ndiswrapper
+
+	dodoc ${S}/README ${S}/INSTALL ${S}/AUTHORS
+
+	insinto /lib/modules/${KV}/misc
+	doins ${S}/driver/ndiswrapper.${KV_OBJ}
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/${P}-modules.d ndiswrapper
+
+	dodir /etc/ndiswrapper
+}
+
+pkg_postinst() {
+	kernel-mod_pkg_postinst
+
+	einfo
+	einfo "ndiswrapper requires .inf and .sys files from a Windows(tm) driver"
+	einfo "to function. Put these somewhere like /usr/lib/hotplug/drivers,"
+	einfo "run 'ndiswrapper -i /usr/lib/hotplug/drivers/foo.inf', edit"
+	einfo "/etc/modules.d/ndiswrapper to add the path to subdirectory in"
+	einfo "/etc/ndiswrapper, then run 'update-modules'."
+	einfo
+}
+
+pkg_config() {
+	ewarn "New versions of ndiswrapper do not require you to run config"
+
+	if [ ! -f "/etc/modules.d/ndiswrapper" ]
+	then
+		eerror "/etc/modules.d/ndiswrapper not found. Please re-emerge"
+		eerror "${PN} to have this file installed, then re-run this script"
+		die "Driver configuration file not found"
+	fi
+
+	I=`lspci -n | grep 'Class 0280:' | cut -d' ' -f4`
+
+	if [ -z "${I}" ]
+	then
+		die "No suitable devices found"
+	fi
+}