Version bump (bug #387439), depend on WEXT_PRIV instead of just WIRELESS_EXT (bug #387131)

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

3 files changed, 124 insertions, 6 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index ec4f9ec103f6..cac21cd87463 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.117 2011/04/30 15:31:54 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.118 2011/10/29 08:14:01 angelos Exp $
+
+*ndiswrapper-1.57_rc1 (29 Oct 2011)
+
+  29 Oct 2011; Christoph Mende <angelos@gentoo.org>
+  +ndiswrapper-1.57_rc1.ebuild:
+  Version bump (bug #387439), depend on WEXT_PRIV instead of just WIRELESS_EXT
+  (bug #387131)
 
   30 Apr 2011; Christoph Mende <angelos@gentoo.org>
   -files/ndiswrapper-1.55-2.6.31.patch:
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 5eb1c5195026..27135ff19a08 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -7,13 +7,15 @@ AUX ndiswrapper-1.56-2.6.38.patch 563 RMD160 c3492a23854165431863f79b15d6dbc94a6
 AUX ndiswrapper-1.56-cflags.patch 421 RMD160 4f16ca9bd3155edab8fb3cf0f7eeeec20f6e9ea8 SHA1 fe52070e80a134dca90916f3301e518785f1e0fd SHA256 aa6192da73358cc0db1ff5a234537245e5f60ef06a4a73c1090190db25404595
 AUX ndiswrapper-1.56-ldflags.patch 365 RMD160 cc52c077e0f36bec53c4f327bffaa4bf40c59602 SHA1 43280b74396d25d9ffd5a0e124b7e6511c06ab24 SHA256 d17f6d84b1dddbe2da2c35370e20ea51e1802e74496918fed4648cf0af66c304
 DIST ndiswrapper-1.56.tar.gz 200770 RMD160 2bbe46fe310999074c78bbfe0761cad3cbd012d8 SHA1 c461cf8e2c1f9e1f87e2a5c5e717f13d2fef5364 SHA256 a738e4271467dc9d40beeaabfc1f48ac0c0a57263b641c2a0edf6c045478d883
+DIST ndiswrapper-1.57rc1.tar.gz 199741 RMD160 44f52219340b3fb1ce984730f1154f4e8267a8f0 SHA1 8d5f978553e5c59e0d898c6ab6e7e388dda737d2 SHA256 c420cc6c909265372668d833e3e8a3128ea7c3d3003372b8271de01a2400ee3a
 EBUILD ndiswrapper-1.56.ebuild 3238 RMD160 73f36c62aac8230b30ab1615316fc062497641cf SHA1 a5a7f94d5e117f24b430c19c9bd06696c9ef7b22 SHA256 3d87e2748c74f2f11166a3ccbde31d1d4028fe93575828da20f467b531227ca4
-MISC ChangeLog 20968 RMD160 ffa5def9bd1e7984b9be79e7a81ce6d22cdcdb39 SHA1 a22042551aeee41d99a8be4d34d2a75e192b6896 SHA256 af1614c43704e73e8f9962c9c79e133d5504d9289f0f733c274b9352f035ad7c
+EBUILD ndiswrapper-1.57_rc1.ebuild 2919 RMD160 0778b310e741d9ecbcd0673a8e5b646f171e3b1f SHA1 c041753201ab072c0738bba1b83fb2d990132f62 SHA256 c46bdbec54533f9c34e2ade465b7652a6fd7d294d29b3b9c7ac0cdf5df926d3e
+MISC ChangeLog 21185 RMD160 b7261e133c45102c29f57e746725f5e00ece184d SHA1 fcc6b491ef010524f9228f5a15b717b592bdad9f SHA256 ce61ce1a57ed6a3f17d2208eccb285f4d96e3c174e39787ace1fdcfe327ba5d3
 MISC metadata.xml 479 RMD160 0be4804aa2a6c2f15156b1866cf979cb34af0cef SHA1 613ebfb1aaae3a4c53aece4a44e95031dc374ce2 SHA256 3b6604467d120503201846a0201c60bc1426dcf697e4cf16db3293380959e819
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk28K2EACgkQmWq1bYTyC0OSCgD/fkHbTNd8wUfbCzhvERItba6+
-BeRH5cYaNeXJORyTKR8A/3nfTEGwJt8SawIeYD3/I6g9X2m43pVwYV/zGXlRTIVk
-=xRpL
+iF4EAREIAAYFAk6rtb8ACgkQmWq1bYTyC0PTDwEAuMLsgnGqsHog2U0qVuqNoOGE
+MrIR7YQvkE23ZuiixNQA/03a1BeTozV0BDpePDhn2+wYHrafvGS2pjT8cGER4XHY
+=7frs
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.57_rc1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.57_rc1.ebuild
new file mode 100644
index 000000000000..8049804cb81b
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.57_rc1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.57_rc1.ebuild,v 1.1 2011/10/29 08:14:01 angelos Exp $
+
+EAPI=4
+inherit base linux-mod toolchain-funcs
+
+MY_PV=${PV/_}
+DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
+HOMEPAGE="http://ndiswrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/testing/${PV/_/-}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug usb"
+
+DEPEND="sys-apps/pciutils"
+RDEPEND="${DEPEND}
+	net-wireless/wireless-tools"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=( "${FILESDIR}"/${PN}-1.56-cflags.patch )
+MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
+BUILD_TARGETS="all"
+MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
+
+pkg_pretend() {
+	CONFIG_CHECK="WEXT_PRIV"
+	use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+	ERROR_USB="You need to enable USB support in your kernel to use usb support in ndiswrapper."
+	ERROR_WEXT_PRIV="Your kernel does not support WEXT_PRIV. To enable it you need to enable a wireless driver that enables it, for example PRISM54 or IPW2200"
+	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)
+
+	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
+	doman ndiswrapper.8
+
+	keepdir /etc/ndiswrapper
+
+	linux-mod_src_install
+
+	cd utils
+	emake DESTDIR="${D}" install
+}
+
+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
+}