Make WEXT_PRIV check non-fatal, remove old

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

5 files changed, 18 insertions, 124 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index cd1e920dd9cd..24e43112f3c4 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.120 2012/05/06 19:13:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.121 2012/05/22 15:54:54 angelos Exp $
+
+  22 May 2012; Christoph Mende <angelos@gentoo.org>
+  -ndiswrapper-1.57_rc1.ebuild, ndiswrapper-1.57.ebuild,
+  ndiswrapper-1.58_rc1.ebuild:
+  Make WEXT_PRIV check non-fatal, remove old
 
 *ndiswrapper-1.58_rc1 (06 May 2012)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 694cc1147557..cda327070183 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -8,18 +8,16 @@ AUX ndiswrapper-1.56-cflags.patch 421 RMD160 4f16ca9bd3155edab8fb3cf0f7eeeec20f6
 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.57.tar.gz 198971 RMD160 73b12f6612d6f96537f74f8cebc21e3898d48b27 SHA1 faa896fd16e43fb93f4e10d9e9f76027c7e6d402 SHA256 208699faa01ab8ca707cb8a28db20417d07887f993c0830dd34c7d9c4f84a56c
-DIST ndiswrapper-1.57rc1.tar.gz 199741 RMD160 44f52219340b3fb1ce984730f1154f4e8267a8f0 SHA1 8d5f978553e5c59e0d898c6ab6e7e388dda737d2 SHA256 c420cc6c909265372668d833e3e8a3128ea7c3d3003372b8271de01a2400ee3a
 DIST ndiswrapper-1.58rc1.tar.gz 199506 RMD160 82171382a1d37319451b3fa8f1076ec162a3a9e4 SHA1 54526ff072f73ff11f1d8d9f9ce92ecd47204cba SHA256 b56dee9d627e64331201bc66d234581abf73ca5663bc369d05f88dd16639830a
 EBUILD ndiswrapper-1.56.ebuild 3238 RMD160 73f36c62aac8230b30ab1615316fc062497641cf SHA1 a5a7f94d5e117f24b430c19c9bd06696c9ef7b22 SHA256 3d87e2748c74f2f11166a3ccbde31d1d4028fe93575828da20f467b531227ca4
-EBUILD ndiswrapper-1.57.ebuild 2857 RMD160 1b6c5b6b4b0e9cc0de0e9b953452889c8ebef738 SHA1 7cd5bc44833dd69dd57fb69f348870b58eab8bca SHA256 275006deab18d15a3f05f93fe8ec0ac3282d84e05ba933cd06b7d9e860ec0897
-EBUILD ndiswrapper-1.57_rc1.ebuild 2919 RMD160 0778b310e741d9ecbcd0673a8e5b646f171e3b1f SHA1 c041753201ab072c0738bba1b83fb2d990132f62 SHA256 c46bdbec54533f9c34e2ade465b7652a6fd7d294d29b3b9c7ac0cdf5df926d3e
-EBUILD ndiswrapper-1.58_rc1.ebuild 2909 RMD160 7674df1a8b1aaa7014d3633bb17a1648ce998702 SHA1 5daa5781f6399af40d81964f694ca4bb2fdb8ddd SHA256 27e385a5e35f6d8822d15c8bd91b1c4b9383db7f81ae370ab661cd1beb7bb7ab
-MISC ChangeLog 21449 RMD160 56d767469dfebc2094b07bed00b2bf08f7d52f10 SHA1 b19debcb9933fadbe6141116f78efb317cf7b8e9 SHA256 ffad39f1b584958286bbdb6c0372438157557399c55b75cfd9f015001506d406
+EBUILD ndiswrapper-1.57.ebuild 2859 RMD160 eba06979e55f8814c4850a099b1192252a27dc75 SHA1 a29a4adbb8973e62e261a7bf4726d3cb61801822 SHA256 a4939184372e52574a52e459663f3883f2feb02b0d89ca1c3fdae196332e4992
+EBUILD ndiswrapper-1.58_rc1.ebuild 2911 RMD160 926cab015967f4be56b03a9ccb65a5ba2c8e5dbc SHA1 303f62c68ac2e40ca2c585092af5269b2b133ce2 SHA256 be3fb75b1864c8d14a3a423676f6ac6cbc106c1f08a73c54552bec3deef13005
+MISC ChangeLog 21635 RMD160 1cd126c834ab4454eff6cceae985943c1475ce8b SHA1 cbf447f6b5f0860f7424b389bf54c21f19c142db SHA256 e76a7abb995723cf26c16d052f54a1097b0e9674f2aa4ac679c8f390a7cb1b59
 MISC metadata.xml 479 RMD160 0be4804aa2a6c2f15156b1866cf979cb34af0cef SHA1 613ebfb1aaae3a4c53aece4a44e95031dc374ce2 SHA256 3b6604467d120503201846a0201c60bc1426dcf697e4cf16db3293380959e819
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+mQXsACgkQmWq1bYTyC0NInwEAnIZ7gw9cP/xQ+B2CwCinjBxI
-H82nhr8NtluQnMMKVCgA/2M3zPwRCxX0PJAsEDx9Lo6SI+Es9WCaw7itd9X0CU65
-=XIU/
+iF4EAREIAAYFAk+7ttUACgkQmWq1bYTyC0OSwQD8CQRAZLoKOvIbtzAq2tFAPQys
+2uS4AAjwV/5KUrvbWaoA/RaY7ZbNZ40a7zh+48CkVPmdVpDTYAE8mu/6dxWdGAPc
+=o5aU
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild
index f7007cbda175..d36358d2f008 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild,v 1.1 2012/02/19 11:10:51 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild,v 1.2 2012/05/22 15:54:54 angelos Exp $
 
 EAPI=4
 inherit base linux-mod toolchain-funcs
@@ -23,8 +23,8 @@ BUILD_TARGETS="all"
 MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
 
 pkg_pretend() {
-	CONFIG_CHECK="WEXT_PRIV"
-	use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+	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
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.57_rc1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.57_rc1.ebuild
deleted file mode 100644
index 8049804cb81b..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-1.57_rc1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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
-}
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild
index 33996ddfa9e5..f970f4c1ee9e 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild,v 1.1 2012/05/06 19:13:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild,v 1.2 2012/05/22 15:54:54 angelos Exp $
 
 EAPI=4
 inherit base linux-mod toolchain-funcs
@@ -26,8 +26,8 @@ BUILD_TARGETS="all"
 MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
 
 pkg_pretend() {
-	CONFIG_CHECK="WEXT_PRIV"
-	use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+	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