marked stable. automatically re-install Windows driver rather then tell the user about it.

(Portage version: 2.0.51.21-r1)

5 files changed, 113 insertions, 19 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index be01829a3367..4e4385afff94 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.21 2005/03/05 22:40:55 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.22 2005/05/07 07:52:08 cardoe Exp $
+
+*ndiswrapper-1.1-r1 (07 May 2005)
+
+  07 May 2005; <cardoe@gentoo.org> ndiswrapper-1.1.ebuild,
+  +ndiswrapper-1.1-r1.ebuild:
+  marked 1.1 and 1.1-r1 as stable
+  1.1-r1 automatically reinstalls the Windows drivers.
+  cleaned up some bash-ness
 
 *ndiswrapper-1.1 (05 Mar 2005)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 1597cfa28923..164974ecb57f 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 201fe516718b1dd646d27e396c4f8a98 ndiswrapper-1.1.ebuild 2848
-MD5 82f761bc0cf99e705d2d284a3edbcac9 ndiswrapper-1.0.ebuild 2810
+MD5 586d7cee0be412aae60a97cfdc134e5a ChangeLog 5047
 MD5 82add84ad0d2f8b69058e245396e3e89 metadata.xml 507
-MD5 1b23493a3b4c15324937e9256fdb54a7 ndiswrapper-1.0_rc4.ebuild 2830
-MD5 e0e149429d1d5e1257bdff7c076c9010 ChangeLog 4805
 MD5 5d8a83b0c152abd17fdefce75d2e0d23 ndiswrapper-0.12-r3.ebuild 3312
+MD5 82f761bc0cf99e705d2d284a3edbcac9 ndiswrapper-1.0.ebuild 2810
 MD5 03f600dea591e448d0d2c4245211be23 ndiswrapper-1.0_rc2.ebuild 2542
+MD5 1b23493a3b4c15324937e9256fdb54a7 ndiswrapper-1.0_rc4.ebuild 2830
+MD5 cbcfcaafe8cdf2f92486801cd818c125 ndiswrapper-1.1.ebuild 2847
+MD5 d8b4bee289e8496d7bbace4737123ea1 ndiswrapper-1.1-r1.ebuild 2608
+MD5 f0f10bcbf8311cd3d857b85c57eb1187 files/digest-ndiswrapper-0.12-r3 68
 MD5 d0665e2746c1e31e88c88be6a869d025 files/digest-ndiswrapper-1.0 67
 MD5 4ca11bf7348bde55011529973be03740 files/digest-ndiswrapper-1.0_rc2 70
-MD5 e88eaf152c6824984685f326bca63a91 files/ndiswrapper-0.9-modules.d 293
 MD5 b4c7549c8735e0f1b8351806135d84db files/digest-ndiswrapper-1.0_rc4 70
-MD5 f0f10bcbf8311cd3d857b85c57eb1187 files/digest-ndiswrapper-0.12-r3 68
 MD5 5902d7ca6595f766e3134e2a7cbec8ea files/digest-ndiswrapper-1.1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCKjWA5+pdB4IBr0URAniyAJwJUekjgfHnmNmNnEso+0PDtgOB+wCfc+9K
-PEUhKNcSpmZP+y/ooFeABk4=
-=8qPx
------END PGP SIGNATURE-----
+MD5 e88eaf152c6824984685f326bca63a91 files/ndiswrapper-0.9-modules.d 293
+MD5 5902d7ca6595f766e3134e2a7cbec8ea files/digest-ndiswrapper-1.1-r1 67
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.1-r1 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.1-r1
new file mode 100644
index 000000000000..ce6d999258d9
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.1-r1
@@ -0,0 +1 @@
+MD5 0738e511f6bbc9f1da3be1c4e35e4a1d ndiswrapper-1.1.tar.gz 135361
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.1-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.1-r1.ebuild
new file mode 100644
index 000000000000..6dca13d7bd73
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.1-r1.ebuild,v 1.1 2005/05/07 07:52:08 cardoe Exp $
+
+inherit linux-mod eutils
+
+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"
+DEPEND="sys-apps/pciutils"
+S=${WORKDIR}/${P}
+
+
+CONFIG_CHECK="${CONFIG_CHECK} NET_RADIO"
+
+MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
+BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} KVERS=${KV_MAJOR}${KV_MINOR}"
+BUILD_TARGETS="all"
+MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
+
+src_unpack() {
+	unpack ${A}
+
+	if grep '# CONFIG_SOFTWARE_SUSPEND2 is not set' ${ROOT}${KV_DIR}/.config
+	then
+		eerror "You have a kernel patched with Software Suspend 2 (swsusp2)"
+		eerror "but don't have it enabled. You must remove the patch or"
+		eerror "enable Software Suspend 2 (swsusp2)."
+		eerror "http://bugs.gentoo.org/show_bug.cgi?id=74864"
+		die "Please fix your kernel"
+	fi
+
+	convert_to_m ${S}/driver/Makefile
+}
+
+src_compile() {
+	# Enable verbose debugging information
+	use debug && export DEBUG=3
+
+	cd utils
+	emake || die "Compile of utils failed!"
+
+	linux-mod_src_compile
+
+}
+
+src_install() {
+	dosbin utils/ndiswrapper
+	dosbin utils/ndiswrapper-buginfo
+
+	into /
+	dosbin utils/loadndisdriver
+
+	dodoc README INSTALL AUTHORS ChangeLog
+	doman ndiswrapper.8
+
+	keepdir /etc/ndiswrapper
+
+	linux-mod_src_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/phpwiki/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
+}
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.1.ebuild
index cc119909a533..9c30a663c819 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.1.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.1.ebuild,v 1.1 2005/03/05 22:40:55 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.1.ebuild,v 1.2 2005/05/07 07:52:08 cardoe Exp $
 
 inherit linux-mod eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://ndiswrapper.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 IUSE="debug 4kstacks"
 DEPEND="sys-apps/pciutils"