revision bump to 1.0rc2, switched to linux-mod

Package-Manager: portage-2.0.51-r13

15 files changed, 110 insertions, 578 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 7585526320e0..4bab3450b2f7 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,16 @@
 # 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.16 2004/12/28 17:02:06 cardoe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.17 2005/01/15 21:11:28 cardoe Exp $
+
+*ndiswrapper-1.0_rc2 (15 Jan 2005)
+
+  15 Jan 2005; Doug Goldstein <cardoe@gentoo.org> -ndiswrapper-0.10.ebuild,
+  -ndiswrapper-0.11.ebuild, -ndiswrapper-0.12-r1.ebuild,
+  -ndiswrapper-0.12-r2.ebuild, -ndiswrapper-0.12.ebuild,
+  +ndiswrapper-1.0_rc2.ebuild:
+  revision bump to 1.0rc2, switched to linux-mod
+  deleted old drivers
+  added local use flag to support 4kstacks
 
 *ndiswrapper-0.12-r3 (28 Dec 2004)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 8bc027b68b2d..c5d8d3057f79 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,25 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fe7572fc819ce3107211018b6d9e05d5 ndiswrapper-0.10.ebuild 2833
-MD5 4e791ae05bd475b1b25f60a4eda6a6cb ndiswrapper-0.12-r1.ebuild 3287
-MD5 dc5ced1ce83104f2ed649ac51e4ff15b ndiswrapper-0.11.ebuild 2860
-MD5 1afb1b7b27c4f755f1db304d3606e0cb ndiswrapper-0.12.ebuild 2938
 MD5 318aca495616bcb1aa9e241c81a2a8c3 metadata.xml 428
-MD5 82a3cd67ca062da00d9390d48ccf71e6 ChangeLog 3762
-MD5 515a93a88139aa1dfce82b378b3d23c2 ndiswrapper-0.12-r3.ebuild 3313
-MD5 55f9e0f761863bb7b6c0946d5f6bc696 ndiswrapper-0.12-r2.ebuild 3312
-MD5 f0f10bcbf8311cd3d857b85c57eb1187 files/digest-ndiswrapper-0.12-r2 68
-MD5 f0f10bcbf8311cd3d857b85c57eb1187 files/digest-ndiswrapper-0.12-r1 68
+MD5 7e87802de082e73fa8c0b7a225b1418d ChangeLog 4134
+MD5 27f807c42ad109239dcc3971118482b6 ndiswrapper-0.12-r3.ebuild 3313
+MD5 03f600dea591e448d0d2c4245211be23 ndiswrapper-1.0_rc2.ebuild 2542
+MD5 4ca11bf7348bde55011529973be03740 files/digest-ndiswrapper-1.0_rc2 70
 MD5 e88eaf152c6824984685f326bca63a91 files/ndiswrapper-0.9-modules.d 293
 MD5 f0f10bcbf8311cd3d857b85c57eb1187 files/digest-ndiswrapper-0.12-r3 68
-MD5 0dc46f89e3f6f6bffc28f1da22926f35 files/digest-ndiswrapper-0.10 67
-MD5 3fcbe2978a1fcde2e180b254492b9672 files/digest-ndiswrapper-0.11 68
-MD5 f0f10bcbf8311cd3d857b85c57eb1187 files/digest-ndiswrapper-0.12 68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB0ZGcFhz/XBeRBtARAjTKAJ9X6BsNDzu+QEebpcIE83Zd2dOGZQCgqpn0
-3xVgwleT2TK7rMYXRPCQkXk=
-=Zc3k
+iD8DBQFB6YcKFhz/XBeRBtARAhY6AJ9vXZuHJ0Q2HpNquNxin6p/uOJluACfWKAG
+i+bpkxGDjzIq0xZLEg/I6Fk=
+=z4d5
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.10 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.10
deleted file mode 100644
index 270dc68edabb..000000000000
--- a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ff4b545443b6d92de0f78773c219872 ndiswrapper-0.10.tar.gz 96809
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.11 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.11
deleted file mode 100644
index dfc3627498c8..000000000000
--- a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 291794187cd08564118015ae8a0af42e ndiswrapper-0.11.tar.gz 105696
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12
deleted file mode 100644
index 3bbb69314c76..000000000000
--- a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01d86483b1d53cde7ae32853672399cc ndiswrapper-0.12.tar.gz 106455
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r1 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r1
deleted file mode 100644
index 3bbb69314c76..000000000000
--- a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01d86483b1d53cde7ae32853672399cc ndiswrapper-0.12.tar.gz 106455
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r2 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r2
deleted file mode 100644
index 3bbb69314c76..000000000000
--- a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01d86483b1d53cde7ae32853672399cc ndiswrapper-0.12.tar.gz 106455
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.0_rc2 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.0_rc2
new file mode 100644
index 000000000000..94db1eb6fe63
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.0_rc2
@@ -0,0 +1 @@
+MD5 7cfc4941980b2378643c8e1474f88696 ndiswrapper-1.0rc2.tar.gz 113023
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild
deleted file mode 100644
index e46e9e5fda3a..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-0.10.ebuild
+++ /dev/null
@@ -1,104 +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.10.ebuild,v 1.3 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
-
-	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.11.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.11.ebuild
deleted file mode 100644
index ea4272c6b51e..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-0.11.ebuild
+++ /dev/null
@@ -1,105 +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.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.12-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.12-r1.ebuild
deleted file mode 100644
index 9ee9f110141e..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-0.12-r1.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.12-r1.ebuild,v 1.3 2004/12/26 00:21:32 cardoe Exp $
-
-inherit linux-info
-
-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="debug"
-DEPEND="sys-apps/pciutils"
-S=${WORKDIR}/${PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-
-	SWS=`grep '# CONFIG_SOFTWARE_SUSPEND2 is not set' ${ROOT}/usr/src/linux/.config`
-
-	if [ -n "${SWS}" ]
-	then
-		eerror "You have a kernel patched with Software Suspend 2 (swsusp2)"
-		eerror "but don't have it enabled. You must remove the patch or"
-		eerror "enable Software Suspend 2 (swsusp2)."
-		eerror "http://bugs.gentoo.org/show_bug.cgi?id=74864"
-		die "Fix your kernel"
-	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
-
-	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
-
-	# Enable verbose debugging information
-	use debug && export DEBUG=3
-
-	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() {
-	echo
-	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}
-	echo
-	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."
-	echo
-}
-
-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.12-r2.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.12-r2.ebuild
deleted file mode 100644
index 345d03eb9870..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-0.12-r2.ebuild
+++ /dev/null
@@ -1,119 +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.12-r2.ebuild,v 1.1 2004/12/27 07:30:36 cardoe Exp $
-
-CONFIG_CHECK="4KSTACKS"
-
-inherit linux-info
-
-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="debug"
-DEPEND="sys-apps/pciutils"
-S=${WORKDIR}/${PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-
-	SWS=`grep '# CONFIG_SOFTWARE_SUSPEND2 is not set' ${ROOT}/usr/src/linux/.config`
-
-	if [ -n "${SWS}" ]
-	then
-		eerror "You have a kernel patched with Software Suspend 2 (swsusp2)"
-		eerror "but don't have it enabled. You must remove the patch or"
-		eerror "enable Software Suspend 2 (swsusp2)."
-		eerror "http://bugs.gentoo.org/show_bug.cgi?id=74864"
-		die "Fix your kernel"
-	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
-
-	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
-
-	# Enable verbose debugging information
-	use debug && export DEBUG=3
-
-	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() {
-	echo
-	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}
-	echo
-	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."
-	echo
-}
-
-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.12-r3.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.12-r3.ebuild
index 2c33c0bab4d8..d1fb8991e5f2 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-0.12-r3.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-0.12-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.12-r3.ebuild,v 1.1 2004/12/28 17:02:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-0.12-r3.ebuild,v 1.2 2005/01/15 21:11:28 cardoe Exp $
 
 CONFIG_CHECK="!4KSTACKS"
 
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.12.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.12.ebuild
deleted file mode 100644
index 5652b71e5f23..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-0.12.ebuild
+++ /dev/null
@@ -1,108 +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.12.ebuild,v 1.1 2004/12/07 19:32:39 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="debug"
-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
-
-	# Enable verbose debugging information
-	use debug && export DEBUG=3
-
-	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() {
-	echo
-	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}
-	echo
-	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."
-	echo
-}
-
-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-1.0_rc2.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.0_rc2.ebuild
new file mode 100644
index 000000000000..11caa6114fab
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.0_rc2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.0_rc2.ebuild,v 1.1 2005/01/15 21:11:28 cardoe Exp $
+
+inherit linux-mod
+
+DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
+HOMEPAGE="http://ndiswrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-1.0rc2.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+IUSE="debug 4kstacks"
+DEPEND="sys-apps/pciutils"
+S=${WORKDIR}/${PN}-1.0rc2
+
+if use !4kstacks
+then
+	CONFIG_CHECK="!4KSTACKS"
+	4KSTACKS_ERROR="CONFIG_4KSTACKS should not be set.\nIf you feel really confident that 4K Stacks will work for you, add '4kstacks' to your USE flags. But don't expect any support from Gentoo."
+fi
+
+MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
+BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} KVERS=${KV_MAJOR}${KV_MINOR}"
+BUILD_TARGETS="all"
+MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
+
+src_unpack() {
+	unpack ${A}
+
+	if grep '# CONFIG_SOFTWARE_SUSPEND2 is not set' ${ROOT}${KV_DIR}/.config
+	then
+		eerror "You have a kernel patched with Software Suspend 2 (swsusp2)"
+		eerror "but don't have it enabled. You must remove the patch or"
+		eerror "enable Software Suspend 2 (swsusp2)."
+		eerror "http://bugs.gentoo.org/show_bug.cgi?id=74864"
+		die "Please fix your kernel"
+	fi
+
+	convert_to_m ${S}/driver/Makefile
+}
+
+src_compile() {
+	# Enable verbose debugging information
+	use debug && export DEBUG=3
+
+	cd utils
+	emake || die "Compile of utils failed!"
+
+	linux-mod_src_compile
+
+}
+
+src_install() {
+	dosbin utils/ndiswrapper
+	dosbin utils/ndiswrapper-buginfo
+
+	into /
+	dosbin utils/loadndisdriver
+
+	dodoc README INSTALL AUTHORS ChangeLog
+	doman ndiswrapper.8
+
+	keepdir /etc/ndiswrapper
+
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	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 "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."
+	echo
+}