rev bump

(Portage version: 2.0.51.22-r1)

5 files changed, 122 insertions, 12 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index c9cad116d029..362cdadc8aba 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2005/05/10 18:50:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.24 2005/06/30 21:31:51 cardoe Exp $
+
+*ndiswrapper-1.2 (30 Jun 2005)
+
+  30 Jun 2005; Doug Goldstein <cardoe@gentoo.org> +ndiswrapper-1.2.ebuild:
+  rev bump
 
   10 May 2005; <cardoe@gentoo.org> -files/ndiswrapper-0.9-modules.d,
   -ndiswrapper-0.12-r3.ebuild, -ndiswrapper-1.0_rc2.ebuild,
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 963cc38b7a25..419d79b72cca 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 65996270bdef7ee284a4dd2d2970d933 ChangeLog 5453
+MD5 d005bd7bafd953967826fbaec83a6346 ChangeLog 5572
 MD5 82add84ad0d2f8b69058e245396e3e89 metadata.xml 507
+MD5 812b2f9dde36aac5d0d791a87a88e920 ndiswrapper-1.2.ebuild 2731
 MD5 955ecb6fb78486d5851d47425e7bae11 ndiswrapper-1.1-r1.ebuild 2660
+MD5 fd2f66ff609bafcd303be1db969e9185 files/digest-ndiswrapper-1.2 67
+MD5 afbf30b80f1d07b7da53a5de063a8913 files/ndiswrapper-1.2-swsusp2.patch 494
 MD5 5902d7ca6595f766e3134e2a7cbec8ea files/digest-ndiswrapper-1.1-r1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCgQWpBtvusYtCZMsRArGvAKCKsCYKcGjroyPIlsVPmGu+XmzEfwCeNQRj
-QXhlrG/TwAGV+xcVyyGg+50=
-=DmDV
------END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.2 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.2
new file mode 100644
index 000000000000..93befd80e381
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.2
@@ -0,0 +1 @@
+MD5 5be0bbe524b68de03c1fc1b0b85b3b60 ndiswrapper-1.2.tar.gz 150068
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.2-swsusp2.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-swsusp2.patch
new file mode 100644
index 000000000000..494dde4f4e4d
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.2-swsusp2.patch
@@ -0,0 +1,14 @@
+diff -ru ndiswrapper-1.2rc1/driver/ntoskernel.h ndiswrapper-1.2rc1-fixed/driver/ntoskernel.h
+--- ndiswrapper-1.2rc1/driver/ntoskernel.h	2005-04-12 09:53:46.000000000 -0400
++++ ndiswrapper-1.2rc1-fixed/driver/ntoskernel.h	2005-05-24 16:16:21.000000000 -0400
+@@ -170,6 +170,10 @@
+ 
+ #endif // LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+ 
++#ifdef CONFIG_SUSPEND2
++#define CONFIG_SOFTWARE_SUSPEND2
++#endif
++
+ #ifdef CONFIG_SOFTWARE_SUSPEND2
+ #define KTHREAD_RUN(a,b,c) kthread_run(a,b,0,c)
+ #else
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild
new file mode 100644
index 000000000000..9dd54975e8b6
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.2.ebuild
@@ -0,0 +1,97 @@
+# 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.2.ebuild,v 1.1 2005/06/30 21:31:51 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"
+RDEPEND="${DEPEND}
+	net-wireless/wireless-tools"
+
+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
+
+	epatch ${FILESDIR}/${P}-swsusp2.patch || die "swsusp2 patch failed"
+
+	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
+}