5 files changed, 152 insertions, 4 deletions
diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 4a9d94ebec81..88c71a3b40ce 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/ndiswrapper
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.108 2009/09/27 12:07:07 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.109 2010/06/22 21:42:35 angelos Exp $
+
+*ndiswrapper-1.56 (22 Jun 2010)
+
+  22 Jun 2010; Christoph Mende <angelos@gentoo.org>
+  +ndiswrapper-1.56.ebuild, +files/ndiswrapper-1.56-ldflags.patch,
+  metadata.xml:
+  Took over package and bumped to 1.56, fixed bugs #210290, #232403, #280057,
+  #322313, #323141
 
   27 Sep 2009; Markus Meier <maekke@gentoo.org> ndiswrapper-1.55-r1.ebuild:
   amd64/x86 stable, bug #286333
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index e4e37239b261..9a418a3f8d9d 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ndiswrapper-1.55-2.6.31.patch 549 RMD160 4f4a25b18de205116a79c5790b49c82316a22118 SHA1 ad48179ae62cb8e71a6a19d0ef0130a523245acc SHA256 8b13dc047acfa480022addfb38885079240f8addb6e259f535b82f446b4db480
+AUX ndiswrapper-1.56-ldflags.patch 365 RMD160 cc52c077e0f36bec53c4f327bffaa4bf40c59602 SHA1 43280b74396d25d9ffd5a0e124b7e6511c06ab24 SHA256 d17f6d84b1dddbe2da2c35370e20ea51e1802e74496918fed4648cf0af66c304
 DIST ndiswrapper-1.55.tar.gz 199019 RMD160 121574be765da889cdb3446af3facab840aa2054 SHA1 84f7b08347f09df109722dccfdf18cf439fbc3be SHA256 dc9ca11c8ff6eaf8b10d4e6a04e982ad46055dfefe619b5f79914aa4fb52f0fe
+DIST ndiswrapper-1.56.tar.gz 200770 RMD160 2bbe46fe310999074c78bbfe0761cad3cbd012d8 SHA1 c461cf8e2c1f9e1f87e2a5c5e717f13d2fef5364 SHA256 a738e4271467dc9d40beeaabfc1f48ac0c0a57263b641c2a0edf6c045478d883
 EBUILD ndiswrapper-1.55-r1.ebuild 2999 RMD160 678779f46797fde5699a5f62b8480a8a056e9578 SHA1 93f6fcf25e4154848b816ffb718e1cdb85069465 SHA256 3fa951bf0c35c17f92f8cdf25f99ebe9073cbac4075d4a870fd51921cdb59b4c
-MISC ChangeLog 19596 RMD160 733f79515771afa22bed31e4533c649907f3b374 SHA1 257ef1aa76817a0cce07bfff54ba72270daa0475 SHA256 df77a2a114c4e45b308210576a4b5962d03026d7d44f6bbbd06cbec62f242f35
-MISC metadata.xml 383 RMD160 4a74c5be8395980c900671a72c5052acb7bd7fbc SHA1 65eb582d92385c395dc5a52e0afdb82bf28fb08a SHA256 87fa14555c841802272659ef90d1656c4b7adceec06f8137555aa707474b00d1
+EBUILD ndiswrapper-1.56.ebuild 2919 RMD160 67c135e2d97f779898dbfb7cfc6c57d1e175bc20 SHA1 dea3fc272297c800406856a8f62a482029cf1cf0 SHA256 975b12893fd201ee74155bf1251400ae00d568d29f624332b23dd0afcc52ebe2
+MISC ChangeLog 19863 RMD160 6c4eb61f972edf49f01ac22fdccab0fcc9363f4c SHA1 05d6df1ee4fa0e7faca127cabd08a69bee3e04fd SHA256 172c35cdf5ec9ac00e5800217d7647c32a0f854e30eb30b0bbe0528492c89013
+MISC metadata.xml 479 RMD160 0be4804aa2a6c2f15156b1866cf979cb34af0cef SHA1 613ebfb1aaae3a4c53aece4a44e95031dc374ce2 SHA256 3b6604467d120503201846a0201c60bc1426dcf697e4cf16db3293380959e819
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwhLmoACgkQmWq1bYTyC0OzfQD/Rn4H0MfiBXfMlmPFscczAvTg
+3ogKEzqscucRcc5hIjYA/1Eb+Wcf12678PhbAV66vvoP0F+0LK/InX6wC02qIHh5
+=N4ID
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-ldflags.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-ldflags.patch
new file mode 100644
index 000000000000..d4e78a61b93d
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/utils/Makefile b/utils/Makefile
+index f1701a6..ca4cefc 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -12,7 +12,7 @@ DISTFILES=Makefile ndiswrapper loadndisdriver.c ndiswrapper-buginfo
+ all: loadndisdriver
+ 
+ loadndisdriver: loadndisdriver.c
+-	$(CC) $(CFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ clean:
+ 	rm -f *~ *.o loadndisdriver
diff --git a/net-wireless/ndiswrapper/metadata.xml b/net-wireless/ndiswrapper/metadata.xml
index fa6716f6434a..02799f48b786 100644
--- a/net-wireless/ndiswrapper/metadata.xml
+++ b/net-wireless/ndiswrapper/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mobile</herd>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
+	</maintainer>
 	<longdescription lang="en">ndiswrapper provides a kernel module and utility for
 		implementing the Windows(tm) NDIS API. This serves to provide drivers
 		for wireless cards that have no native support.
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild
new file mode 100644
index 000000000000..13f8af08b29d
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild,v 1.1 2010/06/22 21:42:35 angelos Exp $
+
+EAPI=2
+inherit base linux-mod toolchain-funcs
+
+DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
+HOMEPAGE="http://ndiswrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/stable/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug usb"
+
+DEPEND="sys-apps/pciutils"
+RDEPEND="${DEPEND}
+	net-wireless/wireless-tools"
+
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
+BUILD_TARGETS="all"
+MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
+
+pkg_setup() {
+	echo
+	einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml"
+	einfo "for a list of supported kernels."
+	echo
+
+	CONFIG_CHECK="WIRELESS_EXT"
+	use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+	ERROR_USB="You need to enable USB support in your kernel to use usb support in ndiswrapper."
+	linux-mod_pkg_setup
+}
+
+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 CC=$(tc-getCC) || die "Compile of utils failed!"
+
+	use usb || params="${params} DISABLE_USB=1"
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KVERS=${KV_FULL} KBUILD='${KV_OUT_DIR}' ${params}"
+	linux-mod_src_compile
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog INSTALL README || die "dodoc failed"
+	doman ndiswrapper.8 || die "doman failed"
+
+	keepdir /etc/ndiswrapper
+
+	linux-mod_src_install
+
+	cd utils
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	echo
+	elog "NDISwrapper requires .inf and .sys files from a Windows(tm) driver"
+	elog "to function. Download these to /root for example, then"
+	elog "run 'ndiswrapper -i /root/foo.inf'. After that you can delete them."
+	elog "They will be copied to /etc/ndiswrapper/."
+	elog "Once done, please run 'update-modules'."
+	echo
+
+	elog "Please look at ${HOMEPAGE}"
+	elog "for the FAQ, HowTos, tips, configuration, and installation"
+	elog "information."
+	echo
+
+	for i in $(lspci -n | egrep '(0280|0200):' |  cut -d' ' -f1)
+	do
+		i_desc=$(lspci -nn | grep "$i" | awk -F': ' '{print $2}' | awk -F'[' '{print $1}')
+		if [[ -n "${i_desc}" ]] ; then
+			elog "Possible hardware: ${i_desc}"
+		fi
+	done
+
+	echo
+	elog "NDISwrapper devs need support (_hardware_, cash)."
+	elog "Don't hesitate if you can help."
+	elog "See ${HOMEPAGE} for details."
+	echo
+
+	if [[ ${ROOT} == "/" ]]; then
+
+		einfo "Attempting to automatically reinstall any Windows drivers"
+		einfo "you might already have."
+		echo
+
+		local driver
+		for driver in $(ls /etc/ndiswrapper) ; do
+			einfo "Driver: ${driver}"
+			mv "/etc/ndiswrapper/${driver}" "${T}"
+			ndiswrapper -i "${T}/${driver}/${driver}.inf"
+		done
+	fi
+}