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.

Package-Manager: portage-2.1_rc2-r3

5 files changed, 141 insertions, 8 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/Manifest b/net-wireless/ndiswrapper/Manifest
index 70d64c1390f3..0c64b2c4a928 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ndiswrapper-1.16-gcc-4.1.patch 352 RMD160 fb7e22c644068ae5af3c3ab5902f7c1ab16f2d8f SHA1 0f1bd34cce6592111d77538a8d394dc4511d342f SHA256 83441ee437df7a48e8437eef766199083ebdef44f44b57f3bf27276027080e85
+MD5 6d4f15db8b96b675f0188e9c4c31878e files/ndiswrapper-1.16-gcc-4.1.patch 352
+RMD160 fb7e22c644068ae5af3c3ab5902f7c1ab16f2d8f files/ndiswrapper-1.16-gcc-4.1.patch 352
+SHA256 83441ee437df7a48e8437eef766199083ebdef44f44b57f3bf27276027080e85 files/ndiswrapper-1.16-gcc-4.1.patch 352
 AUX ndiswrapper-1.2-kernel-2.6.14.patch 1162 RMD160 fc4078f52227336d697d8538c49b875bef7a6984 SHA1 ae33f802b65dbc5cf9b3d2be63442a5174930904 SHA256 e81a2692ca682858efde3c33c1566d077d5b1a80ebd86e70975ad443291b4670
 MD5 69ca885f3c7039ffb61da23aa194653c files/ndiswrapper-1.2-kernel-2.6.14.patch 1162
 RMD160 fc4078f52227336d697d8538c49b875bef7a6984 files/ndiswrapper-1.2-kernel-2.6.14.patch 1162
@@ -14,19 +18,24 @@ MD5 9cf5a13dc78b9840d419f0656d1dd920 files/ndiswrapper-1.2-suspend2.patch 553
 RMD160 8d3c771105181ab3e4489008d0b6127b6566ae48 files/ndiswrapper-1.2-suspend2.patch 553
 SHA256 34134d00fc5a3ab921e17c87bbd00818e11f6393c2110cc98426eb47ed5cc853 files/ndiswrapper-1.2-suspend2.patch 553
 DIST ndiswrapper-1.15.tar.gz 186358 RMD160 cbdf87b5a8af6d72ebac95500ddfe7ecb77d7744 SHA1 caddeffb3e1f391fb0893e60e8d099fbeeea0edd SHA256 cd8c100fa45589bddc738108400749ad578e2cbfd7a8e5d3b4dd8ad44f9b9cdd
+DIST ndiswrapper-1.16.tar.gz 187642 RMD160 5e3e7d9f9086be215c7d0417ed26caa3ec396913 SHA1 d4262a4cf093ec2738c7953de95df704d6a431ef SHA256 9e9dfb72ae86e01b3831095730a88c65fee16b495761153fc75f813ef836908e
 DIST ndiswrapper-1.2.tar.gz 150068 RMD160 6033e2fd920fb321d8656aaa9e2f81d4eb355dfb SHA1 83008087d16059412b830bfdf34bef060f9ce655 SHA256 6b81691955ecf51747cec607bc7cf6d456ae550498b02b8be58b649a45063516
 EBUILD ndiswrapper-1.15.ebuild 2721 RMD160 99d4552f80905c9a63e90c0857defac6bcdbca0e SHA1 5ea5b82d10f99557552b0ad3aae1a9176e1fd23d SHA256 14cdecd7930d6f3edc3ca7a680e7aa268404f0e10be91099031b2aae232da4d8
 MD5 3a9ab8b797474fdc526c204be62dc9c6 ndiswrapper-1.15.ebuild 2721
 RMD160 99d4552f80905c9a63e90c0857defac6bcdbca0e ndiswrapper-1.15.ebuild 2721
 SHA256 14cdecd7930d6f3edc3ca7a680e7aa268404f0e10be91099031b2aae232da4d8 ndiswrapper-1.15.ebuild 2721
+EBUILD ndiswrapper-1.16.ebuild 2729 RMD160 5d6af18a39db84ef5abfd5a97e09975ab2a5b7b5 SHA1 88d4ea0cd0f4c6bbcfd53c36e86f28fe6ce288ab SHA256 167b2f7b150225e86b2171b36fb522c7ef5573a238c5265dad405aeeae057908
+MD5 86b9d3b51274deb19404970c4def6feb ndiswrapper-1.16.ebuild 2729
+RMD160 5d6af18a39db84ef5abfd5a97e09975ab2a5b7b5 ndiswrapper-1.16.ebuild 2729
+SHA256 167b2f7b150225e86b2171b36fb522c7ef5573a238c5265dad405aeeae057908 ndiswrapper-1.16.ebuild 2729
 EBUILD ndiswrapper-1.2-r1.ebuild 2656 RMD160 9b99a7990186e09057d58b000b6d3db92f68c7e5 SHA1 0710489890ce4e4e6b6b3b2e7e4701ea20f7f1bd SHA256 44224f665d5fac129d19f71ee2b69128d65aa5ee022d2a535be0462fabc3bea7
 MD5 f371d88cd65180a2854954cf393168e3 ndiswrapper-1.2-r1.ebuild 2656
 RMD160 9b99a7990186e09057d58b000b6d3db92f68c7e5 ndiswrapper-1.2-r1.ebuild 2656
 SHA256 44224f665d5fac129d19f71ee2b69128d65aa5ee022d2a535be0462fabc3bea7 ndiswrapper-1.2-r1.ebuild 2656
-MISC ChangeLog 9068 RMD160 f1c30496717c932582631617594913042ee53ff3 SHA1 bdfae81ba03a0f9b1f7ff132b0a68a9e6483890c SHA256 4f3234ff7c05d9f79dea267c56889a76c2556e98a1d11e9362a8a0e74c61badb
-MD5 ca1ba2792ae395b4c192b58f82377e0b ChangeLog 9068
-RMD160 f1c30496717c932582631617594913042ee53ff3 ChangeLog 9068
-SHA256 4f3234ff7c05d9f79dea267c56889a76c2556e98a1d11e9362a8a0e74c61badb ChangeLog 9068
+MISC ChangeLog 9355 RMD160 6bc0c24f1004c19beb97a2afa724ff4fe93282fc SHA1 68a67e3c2ff2a58407bf7d1be170f74415c1ff5a SHA256 e0e8984ca15d2bc6656e6f0f541f487721ecd56c95c3dee63896c963f1d842d1
+MD5 bab44a96f9f7672cdc6dadf305fe0b0e ChangeLog 9355
+RMD160 6bc0c24f1004c19beb97a2afa724ff4fe93282fc ChangeLog 9355
+SHA256 e0e8984ca15d2bc6656e6f0f541f487721ecd56c95c3dee63896c963f1d842d1 ChangeLog 9355
 MISC metadata.xml 542 RMD160 e59c2c78c37079622472dd297bacfd879c2d766e SHA1 dbd87b1caef2a5ee2a99a8c9a05d9bc9d17efe4e SHA256 dcb33f229fcbceb751fbaf3ffb33d55e9357f53081b7f7dac32a18060684a8b4
 MD5 8d922dcf7a83d54f22e5831433f2ba65 metadata.xml 542
 RMD160 e59c2c78c37079622472dd297bacfd879c2d766e metadata.xml 542
@@ -34,13 +43,16 @@ SHA256 dcb33f229fcbceb751fbaf3ffb33d55e9357f53081b7f7dac32a18060684a8b4 metadata
 MD5 0ea8035e050ea303288c80fde0e39888 files/digest-ndiswrapper-1.15 250
 RMD160 f76d1906248592ae3a87314c2dabea8f9a8b9757 files/digest-ndiswrapper-1.15 250
 SHA256 edb7fb43063c2c6613c944300c1f2f7889fcebb18e0b3664fff994b1371f0efd files/digest-ndiswrapper-1.15 250
+MD5 aa0402bc7aa8e4c98f4abfeb2a4ba37e files/digest-ndiswrapper-1.16 250
+RMD160 e83ae6abcdd56bcbfda9aa50c44a643def7db955 files/digest-ndiswrapper-1.16 250
+SHA256 04be5c48313ec20029c43c16fc2f03df686d92d11dc4852216683ae900f41cbb files/digest-ndiswrapper-1.16 250
 MD5 c469e607b88c844e8cc38fadc513d186 files/digest-ndiswrapper-1.2-r1 247
 RMD160 bb949b0505ab69f635ed69e08952d328cc9353dd files/digest-ndiswrapper-1.2-r1 247
 SHA256 8f56ae10d30703c082924adc3a3f11e23f868f06ff853790e7d7ffccadd20d8c files/digest-ndiswrapper-1.2-r1 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEeYa8cxLzpIGCsLQRAkWLAJ9b0VvmdQPnqto405CFOma7KkfgdQCgg/Id
-5o+8GlUsNzhiQpc0EYnwVRo=
-=0zo9
+iD8DBQFEeZKYcxLzpIGCsLQRAt2VAKCEw65XhpEB868DluGtlZcdNsEYVQCfZQNX
++MyFp4jPvdo4inAKWTC2tXU=
+=ZkXh
 -----END PGP SIGNATURE-----
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
+}