13 files changed, 129 insertions, 347 deletions
diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 0dfa473db25f..77534f25c490 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.10 2004/08/25 13:16:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.11 2004/10/09 07:30:13 cardoe Exp $
+
+*ndiswrapper-0.11 (09 Oct 2004)
+
+  09 Oct 2004; Doug Goldstein <cardoe@gentoo.org>
+  -files/ndiswrapper-0.6-modules.d, -files/ndiswrapper.modules.d,
+  ndiswrapper-0.10.ebuild, +ndiswrapper-0.11.ebuild,
+  -ndiswrapper-0.6-r1.ebuild, -ndiswrapper-0.6.ebuild,
+  -ndiswrapper-0.8.ebuild:
+  Revision Bump to .11
+  Mark .10 stable on x86
+  clean out old revisions
+  add man page 
 
   25 Aug 2004; Doug Goldstein <cardoe@gentoo.org> -ndiswrapper-0.3.ebuild,
   -ndiswrapper-0.4.ebuild, -ndiswrapper-0.5.ebuild, ndiswrapper-0.9.ebuild:
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 748ef980fee0..224c3e5eecfb 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,25 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d8381f535c93bc4e6a33f1f29ab08713 ndiswrapper-0.10.ebuild 2837
+MD5 fe7572fc819ce3107211018b6d9e05d5 ndiswrapper-0.10.ebuild 2833
 MD5 d2db2238e9f978b035e2e311c9c34c1c ndiswrapper-0.9.ebuild 2675
-MD5 1ba678e85a009c75a020971124067480 ndiswrapper-0.6-r1.ebuild 2033
-MD5 658e6dca313b5223a07b455bae00fc55 ndiswrapper-0.6.ebuild 3308
-MD5 f497d086255f6058b0371c5ad53b3922 ndiswrapper-0.8.ebuild 2312
-MD5 808115f88189435db36a8028fd0401da ChangeLog 2467
+MD5 dc5ced1ce83104f2ed649ac51e4ff15b ndiswrapper-0.11.ebuild 2860
 MD5 0dfb45e6e16bf37b171169afca958121 metadata.xml 429
-MD5 e20c0dc4a4a29e344728d59de5757e3f files/ndiswrapper-0.6-modules.d 515
-MD5 fec18da2febe1a066f79d692b5e5eada files/digest-ndiswrapper-0.6-r1 66
-MD5 fec18da2febe1a066f79d692b5e5eada files/digest-ndiswrapper-0.6 66
-MD5 dd6a51033bdc39b26c28ff48c5f7434d files/digest-ndiswrapper-0.8 66
+MD5 8a39bbb001480d6e72f38db9f045c293 ChangeLog 2842
 MD5 aa232482ba4fdfef2b472bebd374b93d files/digest-ndiswrapper-0.9 66
-MD5 0dc46f89e3f6f6bffc28f1da22926f35 files/digest-ndiswrapper-0.10 67
 MD5 e88eaf152c6824984685f326bca63a91 files/ndiswrapper-0.9-modules.d 293
-MD5 f27b456e9b1d79f449548aa305378312 files/ndiswrapper.modules.d 379
+MD5 0dc46f89e3f6f6bffc28f1da22926f35 files/digest-ndiswrapper-0.10 67
+MD5 3fcbe2978a1fcde2e180b254492b9672 files/digest-ndiswrapper-0.11 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBXrkCcAgAdbxYsnERAuwwAJ4qsCJoQCfAkripkhRYlNsw11ppngCfcQ4N
-fUgb6fz2z6937d5jjM96s8o=
-=M4RY
+iD8DBQFBZ5ONFhz/XBeRBtARAn31AJ4/3LIgHs9uEkH6NvotMQL475TQogCgubZk
+H8wnn8ZPNJvuIGY0kLWHnow=
+=Bgzh
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.11 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.11
new file mode 100644
index 000000000000..dfc3627498c8
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.11
@@ -0,0 +1 @@
+MD5 291794187cd08564118015ae8a0af42e ndiswrapper-0.11.tar.gz 105696
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6
deleted file mode 100644
index 234ac0e4a729..000000000000
--- a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7eee09ad2a869efcff570ef064063654 ndiswrapper-0.6.tar.gz 65134
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6-r1 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6-r1
deleted file mode 100644
index 234ac0e4a729..000000000000
--- a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7eee09ad2a869efcff570ef064063654 ndiswrapper-0.6.tar.gz 65134
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.8 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.8
deleted file mode 100644
index e18fc948f6d8..000000000000
--- a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 96c484927b5938b537b09969a6de7a34 ndiswrapper-0.8.tar.gz 69625
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-0.6-modules.d b/net-wireless/ndiswrapper/files/ndiswrapper-0.6-modules.d
deleted file mode 100644
index 468a3621aa19..000000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-0.6-modules.d
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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/files/ndiswrapper.modules.d b/net-wireless/ndiswrapper/files/ndiswrapper.modules.d
deleted file mode 100644
index ef75049e5a8f..000000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper.modules.d
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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 added the paths
-# to the .sys and .inf files from Windows(tm)
-#
-#post-install ndiswrapper loadndisdriver VENDORID DEVICEID foo.sys foo.inf
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild
index 34852f93d232..e46e9e5fda3a 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild,v 1.2 2004/10/02 14:19:34 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild,v 1.3 2004/10/09 07:30:13 cardoe Exp $
 
 inherit kernel-mod
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="sys-apps/pciutils"
 S=${WORKDIR}/${PN}-${PV}
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.11.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.11.ebuild
new file mode 100644
index 000000000000..ea4272c6b51e
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-0.11.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.11.ebuild,v 1.1 2004/10/09 07:30:13 cardoe Exp $
+
+inherit kernel-mod
+
+DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
+HOMEPAGE="http://ndiswrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="sys-apps/pciutils"
+S=${WORKDIR}/${PN}-${PV}
+
+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
+
+	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
+	then
+		sed -i 's:SUBDIRS=:M=:g' ${S}/driver/Makefile
+	fi
+}
+
+src_compile() {
+	# Unset ARCH for 2.5/2.6 kernel compiles
+	if [ ${KV_MINOR} -gt 4 ] ; then
+		unset ARCH
+	fi
+
+	emake || die "Compile Failed!"
+}
+
+src_install() {
+	if [ ${KV_MINOR} -gt 4 ]
+	then
+		MOD_SUFFIX="ko"
+	else
+		MOD_SUFFIX="o"
+	fi
+
+	dosbin ${S}/utils/ndiswrapper
+	dosbin ${S}/utils/ndiswrapper-buginfo
+
+	dodoc ${S}/README ${S}/INSTALL ${S}/AUTHORS ${S}/ChangeLog
+	doman ${S}/ndiswrapper.8
+
+	insinto /lib/modules/${KV}/misc
+	doins ${S}/driver/ndiswrapper.${MOD_SUFFIX}
+
+	into /
+	dosbin ${S}/utils/loadndisdriver
+
+	insinto /etc/modules.d
+	newins ${FILESDIR}/${PN}-0.9-modules.d ndiswrapper
+
+	dodir /etc/ndiswrapper
+}
+
+pkg_postinst() {
+	einfo "Checking kernel module dependencies"
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+
+
+	einfo
+	einfo "ndiswrapper requires .inf and .sys files from a Windows(tm) driver"
+	einfo "to function. Download these to /root for example, then"
+	einfo "run 'ndiswrapper -i /root/foo.inf'. After that you can delete them."
+	einfo "They will be copied to the proper location."
+	einfo "Once done, please run 'update-modules'."
+	einfo
+	einfo "As of release 0.9, you no longer have to call 'loadndiswrapper'"
+	einfo "explicitly.  The module will handle it automatically."
+	einfo
+	einfo "check http://ndiswrapper.sf.net/supported_chipsets.html for drivers"
+	I=`lspci -n | egrep 'Class (0280|0200):' |  cut -d' ' -f4`
+	einfo "Look for the following on that page for your driver:"
+	einfo ${I}
+	einfo
+	einfo "Please have a look at http://ndiswrapper.sourceforge.net/wiki/"
+	einfo "for the FAQ, HowTos, Tips, Configuration, and installation"
+	einfo "information."
+	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
+}
+
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.6-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.6-r1.ebuild
deleted file mode 100644
index d757775e9396..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-0.6-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.6-r1.ebuild,v 1.3 2004/07/08 03:20:08 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}
-
-	# 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
-}
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.6.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.6.ebuild
deleted file mode 100644
index a95a27d1f854..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-0.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.2 2004/06/25 00:46:46 agriffis 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.8.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.8.ebuild
deleted file mode 100644
index 257c399ffb79..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-0.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.8.ebuild,v 1.2 2004/07/08 23:52:53 mr_bones_ Exp $
-
-inherit kernel-mod
-
-MY_P=${PN}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
-HOMEPAGE="http://ndiswrapper.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_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
-
-	if [ ${KV_MINOR} -gt 5 ] && [ ${KV_PATCH} -gt 5 ]
-	then
-		sed -i 's:SUBDIRS=:M=:g' ${S}/driver/Makefile
-	fi
-}
-
-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}/${PN}-0.6-modules.d ndiswrapper
-
-	dodir /etc/ndiswrapper
-}
-
-pkg_postinst() {
-	einfo "Checking kernel module dependancies"
-	test -r "${ROOT}/usr/src/linux/System.map" && \
-		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
-
-	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
-}