Version bump.

(Portage version: 2.1.2.9)

4 files changed, 160 insertions, 1 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 5d61e55c5b17..a2eef539ca3c 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ndiswrapper
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.83 2007/05/28 19:44:59 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.84 2007/06/12 11:17:35 peper Exp $
+
+*ndiswrapper-1.46 (12 Jun 2007)
+
+  12 Jun 2007; Piotr Jaroszyński <peper@gentoo.org>
+  +files/ndiswrapper-1.46-ksrc.patch, +ndiswrapper-1.46.ebuild:
+  Version bump.
 
 *ndiswrapper-1.45 (28 May 2007)
 
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.46 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.46
new file mode 100644
index 000000000000..6cb2e87d34ad
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.46
@@ -0,0 +1,3 @@
+MD5 971d007bedbd831190ab341e771ddbde ndiswrapper-1.46.tar.gz 198155
+RMD160 dcabd6e83f351c397dc40285ce2a2814d16e411f ndiswrapper-1.46.tar.gz 198155
+SHA256 84971a43e560177ab837cd231eeb20af50e7bb84c82ea510754ac220efbf383d ndiswrapper-1.46.tar.gz 198155
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.46-ksrc.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.46-ksrc.patch
new file mode 100644
index 000000000000..ee5fb3751b62
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.46-ksrc.patch
@@ -0,0 +1,35 @@
+--- ndiswrapper-1.46/driver/Makefile.org	2007-06-12 13:08:47.000000000 +0200
++++ ndiswrapper-1.46/driver/Makefile	2007-06-12 13:12:20.000000000 +0200
+@@ -232,12 +232,12 @@
+ 
+ compat.h: $(KBUILD)/include/linux/version.h
+ 	@echo "/* this file is automatically generated */" > $@
+-	@if ! grep -qw kzalloc $(KBUILD)/include/linux/*.h; then \
++	@if ! grep -qw kzalloc $(KSRC)/include/linux/*.h; then \
+ 		echo "static inline void *kzalloc(size_t size, unsigned long flags)"; \
+ 		echo "{ void *ret = kmalloc(size, flags);"; \
+ 		echo "if (ret) memset(ret, 0, size); return ret;}"; \
+ 	fi >> $@
+-	@if ! grep -qw netif_tx_lock $(KBUILD)/include/linux/netdevice.h; then \
++	@if ! grep -qw netif_tx_lock $(KSRC)/include/linux/netdevice.h; then \
+ 		echo "static inline void netif_tx_lock(struct net_device *dev)"; \
+ 		echo "{ spin_lock(&dev->xmit_lock); }"; \
+ 		echo "static inline void netif_tx_unlock(struct net_device *dev)"; \
+@@ -248,14 +248,14 @@
+ 		echo "{ spin_unlock_bh(&dev->xmit_lock); }"; \
+ 	fi >> $@
+ 	@if ! grep -qw pci_set_consistent_dma_mask \
+-			   $(KBUILD)/include/linux/pci.h; then \
++			   $(KSRC)/include/linux/pci.h; then \
+ 		echo "static inline int pci_set_consistent_dma_mask" ; \
+ 		echo "(struct pci_dev *dev, u64 mask) { return 0; }" ; \
+ 	fi >> $@
+-	@if ! grep -qw create_workqueue $(KBUILD)/include/linux/*.h; then \
++	@if ! grep -qw create_workqueue $(KSRC)/include/linux/*.h; then \
+ 		echo "#define WRAP_WQ 1"; \
+ 	fi >> $@
+-	@if ! grep -qw create_workqueue $(KBUILD)/include/linux/*.h; then \
++	@if ! grep -qw create_workqueue $(KSRC)/include/linux/*.h; then \
+ 		echo "#define WRAP_WQ 1"; \
+ 	fi >> $@
+ 
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.46.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.46.ebuild
new file mode 100644
index 000000000000..a0f9b689d54f
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.46.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.46.ebuild,v 1.1 2007/06/12 11:17:35 peper Exp $
+
+inherit linux-mod
+
+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="~amd64 ~x86"
+IUSE="debug usb"
+
+DEPEND="sys-apps/pciutils"
+RDEPEND="${DEPEND}
+	net-wireless/wireless-tools"
+
+CONFIG_CHECK="WIRELESS_EXT"
+
+MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
+BUILD_TARGETS="all"
+MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
+
+ERROR_USB="You need to enable USB support in your kernel
+to use usb support in ndiswrapper."
+
+pkg_setup() {
+	echo
+	einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml"
+	einfo "for a list of supported kernels."
+	echo
+
+	use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-ksrc.patch"
+	convert_to_m "${S}/driver/Makefile"
+}
+
+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 || die "Compile of utils failed!"
+
+	use usb || params="DISABLE_USB=1"
+
+	# Does not like parallel builds
+	# http://bugs.gentoo.org/show_bug.cgi?id=154213
+	# KBUILD value can't be quoted
+	# http://bugs.gentoo.org/show_bug.cgi?id=156319
+	BUILD_PARAMS="KSRC=${KV_DIR} KVERS=${KV_FULL} KBUILD=${KV_OUT_DIR} ${params} -j1"
+	linux-mod_src_compile
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog INSTALL README
+	doman ndiswrapper.8 || die
+
+	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'."
+	elog
+
+	elog "Please look at ${HOMEPAGE}"
+	elog "for the FAQ, HowTos, tips, configuration, and installation"
+	elog "information."
+	elog
+
+	local i=$(lspci -n | egrep 'Class (0280|0200):' |  cut -d' ' -f4)
+	if [[ -n "${i}" ]] ; then
+		elog "Possible hardware: ${i}"
+		elog
+	fi
+
+	elog "NDISwrapper devs need support (_hardware_, cash)."
+	elog "Don't hesitate if you can help."
+	elog "See ${HOMEPAGE} for details."
+	echo
+
+	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
+}