Bump. Better support for various drivers/chipsets.

7 files changed, 257 insertions, 3 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 412855485656..c8a4f514d6fe 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,12 @@
 # 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.2 2004/03/06 23:44:20 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.3 2004/03/25 04:47:06 latexer Exp $
+
+*ndiswrapper-0.6 (24 Mar 2004)
+
+  24 Mar 2004; Peter Johanson <latexer@gentoo.org> ndiswrapper-0.4.ebuild,
+  ndiswrapper-0.5.ebuild, ndiswrapper-0.6.ebuild:
+  Bump, and add checks to make sure a sufficently new kernel is found.
 
 *ndiswrapper-0.3 (06 Mar 2004)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 34b2f48205bd..90889956876b 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,7 +1,11 @@
-MD5 49de1b07262dfa906a9225eae866b418 ndiswrapper-0.4.ebuild 2922
+MD5 fe096679c2877af87e950eb1bc2f16d3 ndiswrapper-0.5.ebuild 3316
+MD5 2c40053fe7cacfa8f5c3738477056f04 ndiswrapper-0.4.ebuild 3182
+MD5 fe096679c2877af87e950eb1bc2f16d3 ndiswrapper-0.6.ebuild 3316
 MD5 92cf89acd901e8374e504fcdb62c7b0d ndiswrapper-0.3.ebuild 2856
 MD5 f8e07846fd5adbd943c841f6f55b7ebb ChangeLog 742
 MD5 0dfb45e6e16bf37b171169afca958121 metadata.xml 429
 MD5 d5bd4c071015eef1d33281dd95f668e7 files/digest-ndiswrapper-0.3 66
 MD5 922f4572dd8899c80920a0aea4485be9 files/digest-ndiswrapper-0.4 66
+MD5 5a45570913b15b02817cfdfebbd02536 files/digest-ndiswrapper-0.5 66
+MD5 fec18da2febe1a066f79d692b5e5eada files/digest-ndiswrapper-0.6 66
 MD5 f27b456e9b1d79f449548aa305378312 files/ndiswrapper.modules.d 379
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.5 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.5
new file mode 100644
index 000000000000..b436839c7506
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.5
@@ -0,0 +1 @@
+MD5 62d6a84b4e461fc170dfbd984f6f168e ndiswrapper-0.5.tar.gz 63761
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6
new file mode 100644
index 000000000000..234ac0e4a729
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6
@@ -0,0 +1 @@
+MD5 7eee09ad2a869efcff570ef064063654 ndiswrapper-0.6.tar.gz 65134
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.4.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.4.ebuild
index 83fbc2b74049..dd846c81a604 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-0.4.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.4.ebuild,v 1.1 2004/02/29 04:21:59 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.4.ebuild,v 1.2 2004/03/25 04:47:06 latexer Exp $
 
 inherit kernel-mod
 
@@ -20,6 +20,14 @@ src_unpack() {
 	kernel-mod_getversion
 	unpack ${A}
 
+	if [ ${KV_MINOR} -eq 4 ]  && [ ${KV_PATCH} -lt 23 ]
+	then
+		eerror "${P} requires a 2.4 kernel version of at"
+		eerror "least 2.4.23. You can either upgrade your kernel,"
+		eerror "Or use the ndiswrapper-0.3 ebuild."
+		die "Kernel version not supported"
+	fi
+
 	# Fix path to kernel and KVERS
 	sed -i -e "s:^KSRC.*:KSRC=${ROOT}/usr/src/linux:" \
 		-e "s:^KVERS.*:KVERS=${KV_MAJOR}${KV_MINOR}:" \
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.5.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.5.ebuild
new file mode 100644
index 000000000000..37caa8da6dba
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-0.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.5.ebuild,v 1.1 2004/03/25 04:47:06 latexer Exp $
+
+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}
+
+	if [ ${KV_MINOR} -eq 4 ]  && [ ${KV_PATCH} -lt 23 ]
+	then
+		eerror "${P} requires a 2.4 kernel version of at"
+		eerror "least 2.4.23. You can either upgrade your kernel,"
+		eerror "Or use the ndiswrapper-0.3 ebuild."
+		die "Kernel version not supported"
+	fi
+
+	# 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
+	dodoc ${S}/README ${S}/INSTALL ${S}/AUTHORS
+
+	insinto /lib/modules/${KV}/misc
+	doins ${S}/driver/ndiswrapper.${KV_OBJ}
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/ndiswrapper.modules.d ndiswrapper
+}
+
+pkg_postinst() {
+	einfnfo "Checking kernel module dependancies"
+	test -r "${ROOT}/${KV_OUTPUT}/System.map" && \
+		depmod -ae -F "${ROOT}/${KV_OUTPUT}/System.map" -b "${ROOT}" -r ${KV}
+
+	einfo "Part of the ${PN} module configuration can be done by running"
+	einfo "# ebuild /var/db/pkg/net-wiress/${P}/${P}.ebuild config"
+	einfo "Please consult /etc/modules.d/ndiswrapper to finish"
+	einfo "configuring the driver"
+	einfo
+	einfo "In particular, ndiswrapper requires .inf and .sys files from"
+	einfo "a Windows(tm) driver to function. Put these somewhere like"
+	einfo "/usr/lib/hotplug/drivers, edit /etc/modules.d/ndiswrapper to match,"
+	einfo "then run 'update-modules'"
+	einfo
+}
+
+pkg_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
+
+	if ! egrep "VENDORID" /etc/modules.d/ndiswrapper
+	then
+		eerror "/etc/modules.d/ndiswrapper doesn't appear to be the one"
+		eerror "distributed by the ${PN} ebuild. To use this config script,"
+		eerror "Please re-emerge ${PN} and then re-run this script."
+		die "Driver configuration file not usable"
+	else
+		einfo "Found acceptable config file at /etc/modules.d/ndiswrapper"
+	fi
+
+	if [ `lspci -n | grep 'Class 0280:' | wc -l` -gt 1 ]
+	then
+		eerror "More than one suitable device detected. This script"
+		eerror "will only work with one suitable device present."
+		die "Too many potential devices found"
+	fi
+
+	I=`lspci -n | grep 'Class 0280:' | cut -d' ' -f4`
+
+	if [ -z "${I}" ]
+	then
+		die "No suitable devices found"
+	fi
+
+	VENDOR=`echo $I | cut -d':' -f1`
+	DEVICEID=`echo $I | cut -d':' -f2`
+
+	einfo "Setting the vendor ID to ${VENDOR} and the device ID to ${DEVICEID}"
+	sed -i -e "s:VENDORID:${VENDOR}:" \
+		-e "s:DEVICEID:${DEVICEID}:" \
+		/etc/modules.d/ndiswrapper
+}
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.6.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.6.ebuild
new file mode 100644
index 000000000000..b77f98e61342
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-0.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.6.ebuild,v 1.1 2004/03/25 04:47:06 latexer Exp $
+
+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}
+
+	if [ ${KV_MINOR} -eq 4 ]  && [ ${KV_PATCH} -lt 23 ]
+	then
+		eerror "${P} requires a 2.4 kernel version of at"
+		eerror "least 2.4.23. You can either upgrade your kernel,"
+		eerror "Or use the ndiswrapper-0.3 ebuild."
+		die "Kernel version not supported"
+	fi
+
+	# 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
+	dodoc ${S}/README ${S}/INSTALL ${S}/AUTHORS
+
+	insinto /lib/modules/${KV}/misc
+	doins ${S}/driver/ndiswrapper.${KV_OBJ}
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/ndiswrapper.modules.d ndiswrapper
+}
+
+pkg_postinst() {
+	einfnfo "Checking kernel module dependancies"
+	test -r "${ROOT}/${KV_OUTPUT}/System.map" && \
+		depmod -ae -F "${ROOT}/${KV_OUTPUT}/System.map" -b "${ROOT}" -r ${KV}
+
+	einfo "Part of the ${PN} module configuration can be done by running"
+	einfo "# ebuild /var/db/pkg/net-wiress/${P}/${P}.ebuild config"
+	einfo "Please consult /etc/modules.d/ndiswrapper to finish"
+	einfo "configuring the driver"
+	einfo
+	einfo "In particular, ndiswrapper requires .inf and .sys files from"
+	einfo "a Windows(tm) driver to function. Put these somewhere like"
+	einfo "/usr/lib/hotplug/drivers, edit /etc/modules.d/ndiswrapper to match,"
+	einfo "then run 'update-modules'"
+	einfo
+}
+
+pkg_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
+
+	if ! egrep "VENDORID" /etc/modules.d/ndiswrapper
+	then
+		eerror "/etc/modules.d/ndiswrapper doesn't appear to be the one"
+		eerror "distributed by the ${PN} ebuild. To use this config script,"
+		eerror "Please re-emerge ${PN} and then re-run this script."
+		die "Driver configuration file not usable"
+	else
+		einfo "Found acceptable config file at /etc/modules.d/ndiswrapper"
+	fi
+
+	if [ `lspci -n | grep 'Class 0280:' | wc -l` -gt 1 ]
+	then
+		eerror "More than one suitable device detected. This script"
+		eerror "will only work with one suitable device present."
+		die "Too many potential devices found"
+	fi
+
+	I=`lspci -n | grep 'Class 0280:' | cut -d' ' -f4`
+
+	if [ -z "${I}" ]
+	then
+		die "No suitable devices found"
+	fi
+
+	VENDOR=`echo $I | cut -d':' -f1`
+	DEVICEID=`echo $I | cut -d':' -f2`
+
+	einfo "Setting the vendor ID to ${VENDOR} and the device ID to ${DEVICEID}"
+	sed -i -e "s:VENDORID:${VENDOR}:" \
+		-e "s:DEVICEID:${DEVICEID}:" \
+		/etc/modules.d/ndiswrapper
+}