switched to linux-info from kernel-mod. Protect bugzilla from pointless bug reports with some kernel param checking.

4 files changed, 134 insertions, 5 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 2a675080daee..f943e569063c 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.12 2004/12/07 19:32:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.13 2004/12/19 07:27:26 cardoe Exp $
+
+*ndiswrapper-0.12-r1 (19 Dec 2004)
+
+  19 Dec 2004; Doug Goldstein <cardoe@gentoo.org>
+  +ndiswrapper-0.12-r1.ebuild:
+  Added support to properly detect if a user is using SWSUSP2 patches.
+  While they are now functioning, they will not function if applied and
+  then if it is not enabled in the kernel.
+  
+  Switched from kernel-mod to linux-info eclass.
 
 *ndiswrapper-0.12 (07 Dec 2004)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 9dbd2e2e209e..882f4e5520f8 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -2,12 +2,14 @@
 Hash: SHA1
 
 MD5 fe7572fc819ce3107211018b6d9e05d5 ndiswrapper-0.10.ebuild 2833
+MD5 b81de91bbfe2fdaadac25c3099c32cd0 ndiswrapper-0.12-r1.ebuild 3232
 MD5 d2db2238e9f978b035e2e311c9c34c1c ndiswrapper-0.9.ebuild 2675
 MD5 dc5ced1ce83104f2ed649ac51e4ff15b ndiswrapper-0.11.ebuild 2860
 MD5 1afb1b7b27c4f755f1db304d3606e0cb ndiswrapper-0.12.ebuild 2938
 MD5 0dfb45e6e16bf37b171169afca958121 metadata.xml 429
-MD5 47ded4bc6d9a092adcf58b8a2e601e67 ChangeLog 2967
+MD5 906ff33b9b09efa2a870bd4470650d24 ChangeLog 3323
 MD5 aa232482ba4fdfef2b472bebd374b93d files/digest-ndiswrapper-0.9 66
+MD5 f0f10bcbf8311cd3d857b85c57eb1187 files/digest-ndiswrapper-0.12-r1 68
 MD5 e88eaf152c6824984685f326bca63a91 files/ndiswrapper-0.9-modules.d 293
 MD5 0dc46f89e3f6f6bffc28f1da22926f35 files/digest-ndiswrapper-0.10 67
 MD5 3fcbe2978a1fcde2e180b254492b9672 files/digest-ndiswrapper-0.11 68
@@ -15,7 +17,7 @@ MD5 f0f10bcbf8311cd3d857b85c57eb1187 files/digest-ndiswrapper-0.12 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBtfzPFhz/XBeRBtARAjYaAJ4yNcsa2R84KlU8dkMT71iNNrU3egCgiECD
-vTABfeOyzkujF0sheV2FQ9U=
-=xNRz
+iD8DBQFBxSa+Fhz/XBeRBtARAlbfAJ9o9X5T+LQYGqpLnrDBaAjY3CfZeQCfQlTE
+MuuEaXYdAaRt2lMHlwPhVss=
+=q+xN
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r1 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r1
new file mode 100644
index 000000000000..3bbb69314c76
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-0.12-r1
@@ -0,0 +1 @@
+MD5 01d86483b1d53cde7ae32853672399cc ndiswrapper-0.12.tar.gz 106455
diff --git a/net-wireless/ndiswrapper/ndiswrapper-0.12-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-0.12-r1.ebuild
new file mode 100644
index 000000000000..c7f861e76d11
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-0.12-r1.ebuild
@@ -0,0 +1,116 @@
+# 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.1 2004/12/19 07:27:26 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)."
+		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
+}
+