Version bump. This version only fixes issues with 2.4 kernels. Also added a patch to fix a warning with gcc 4.1 wrt bug #134587.

(Portage version: 2.1_rc2-r3)

4 files changed, 122 insertions, 1 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 47c5d76d4ece..566d4124efd7 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.49 2006/05/28 11:17:01 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.50 2006/05/28 12:05:56 betelgeuse Exp $
+
+*ndiswrapper-1.16 (28 May 2006)
+
+  28 May 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +files/ndiswrapper-1.16-gcc-4.1.patch, +ndiswrapper-1.16.ebuild:
+  Version bump. This version only fixes issues with 2.4 kernels. Also added a
+  patch to fix a warning with gcc 4.1 wrt bug #134587.
 
   28 May 2006; Petteri Räty <betelgeuse@gentoo.org>
   -ndiswrapper-1.9.ebuild, -ndiswrapper-1.11.ebuild,
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.16 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.16
new file mode 100644
index 000000000000..f45c1025af9c
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.16
@@ -0,0 +1,3 @@
+MD5 478d62def83d722fc0635afc44202e7c ndiswrapper-1.16.tar.gz 187642
+RMD160 5e3e7d9f9086be215c7d0417ed26caa3ec396913 ndiswrapper-1.16.tar.gz 187642
+SHA256 9e9dfb72ae86e01b3831095730a88c65fee16b495761153fc75f813ef836908e ndiswrapper-1.16.tar.gz 187642
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.16-gcc-4.1.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.16-gcc-4.1.patch
new file mode 100644
index 000000000000..fa02f8d9b8d2
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.16-gcc-4.1.patch
@@ -0,0 +1,11 @@
+--- ndiswrapper-1.15/driver/ntoskernel.c	2006-05-06 04:46:30.000000000 -0700
++++ ndiswrapper/driver/ntoskernel.c	2006-05-27 21:37:57.000000000 -0700
+@@ -1625,7 +1625,7 @@
+ 	(struct nt_event *nt_event)
+ {
+ 	EVENTENTER("event = %p", nt_event);
+-	xchg(&nt_event->dh.signal_state, 0);
++	(void)xchg(&nt_event->dh.signal_state, 0);
+ 	EVENTEXIT(return);
+ }
+ 
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.16.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.16.ebuild
new file mode 100644
index 000000000000..e4686f3eeb4a
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.16.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.16.ebuild,v 1.1 2006/05/28 12:05:56 betelgeuse Exp $
+
+inherit eutils linux-mod
+
+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"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="debug usb"
+DEPEND="sys-apps/pciutils"
+RDEPEND="${DEPEND}
+	net-wireless/wireless-tools"
+
+CONFIG_CHECK="NET_RADIO"
+
+MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
+BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} KVERS=${KV_FULL}"
+BUILD_TARGETS="all"
+MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
+
+ERROR_USB="You need to enable USB support in your kernel
+to use usb support in ndiswrapper."
+
+pkg_setup() {
+	einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml for a list of supported kernels."
+	echo  ""
+	use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.2-suspend2.patch
+	epatch ${FILESDIR}/${P}-gcc-4.1.patch
+
+	convert_to_m ${S}/driver/Makefile
+}
+
+src_compile() {
+	local params
+
+	# Enable verbose debugging information
+	if use debug; then
+		params="DEBUG=3"
+		use usb && params="${params} USB_DEBUG=1"
+	fi
+
+	cd utils
+	emake || die "Compile of utils failed!"
+
+	use usb || params="DISABLE_USB=1"
+
+	BUILD_PARAMS="${BUILD_PARAMS} ${params}" linux-mod_src_compile
+}
+
+src_install() {
+	dodoc README INSTALL AUTHORS ChangeLog
+	doman ndiswrapper.8
+
+	keepdir /etc/ndiswrapper
+
+	linux-mod_src_install
+
+	cd utils
+	make DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	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'."
+	echo
+	einfo "check http://ndiswrapper.sf.net/mediawiki/index.php/List for drivers"
+	I=$(lspci -n | egrep 'Class (0280|0200):' |  cut -d' ' -f4)
+	einfo "Look for the following on that page for your driver:"
+	einfo "Possible Hardware: ${I}"
+	echo
+	einfo "Please have a look at http://ndiswrapper.sourceforge.net/wiki/"
+	einfo "for the FAQ, HowTos, Tips, Configuration, and installation"
+	einfo "information."
+	echo
+	ewarn "Attempting to automatically reinstall any Windows drivers"
+	ewarn "you might already have."
+	for driver in $(ls /etc/ndiswrapper)
+	do
+		einfo "Driver: ${driver}"
+		mv /etc/ndiswrapper/${driver} /tmp
+		ndiswrapper -i /tmp/${driver}/${driver}.inf
+	done
+}