Version bump.

Package-Manager: portage-2.1.2.9

5 files changed, 179 insertions, 8 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/Manifest b/net-wireless/ndiswrapper/Manifest
index 58dfee7a7ee3..e75ecb48f88b 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ndiswrapper-1.46-ksrc.patch 1635 RMD160 705a2ebc0198eb9c94e041e544128adb44824733 SHA1 fc44ca239c8a8ab067d88a8371fbafb85a1421e9 SHA256 6b46e194ec4418f6497c97d88679f2ecc02451516396cffda43e3945b02dcf52
+MD5 cfee50f4333a1d748410518d212eccc7 files/ndiswrapper-1.46-ksrc.patch 1635
+RMD160 705a2ebc0198eb9c94e041e544128adb44824733 files/ndiswrapper-1.46-ksrc.patch 1635
+SHA256 6b46e194ec4418f6497c97d88679f2ecc02451516396cffda43e3945b02dcf52 files/ndiswrapper-1.46-ksrc.patch 1635
 AUX ndiswrapper-new_suspend2.patch 891 RMD160 1dbb59e400ea8cac62bbc6cbb2c757b08b078c91 SHA1 6fdde32982d8c422838a3b5f9934245dd5869459 SHA256 dec61532d2c7eec07f387681616026e0472bc1d9024785a1bb5178769f6c2e5c
 MD5 60ddd4e37f18054a51d9fc5cc8d1e230 files/ndiswrapper-new_suspend2.patch 891
 RMD160 1dbb59e400ea8cac62bbc6cbb2c757b08b078c91 files/ndiswrapper-new_suspend2.patch 891
@@ -18,6 +22,7 @@ DIST ndiswrapper-1.42.tar.gz 192124 RMD160 a112e7e2d416af98030ebfc0912a9b632019d
 DIST ndiswrapper-1.43.tar.gz 193346 RMD160 dd2716b377408e916ebef64f15db180dace37a03 SHA1 7677db5cae51f14213a064fac91646491c325791 SHA256 410080f1c47b9462aa7012c7a38e569f0c8d59ac4527f0834f785d8cf6a35fd3
 DIST ndiswrapper-1.44.tar.gz 195228 RMD160 4e44e0c54bf767d0091f1188b6f1c4ae9416a79b SHA1 71662bae294d1f88093fd08ec7d0b0cfed96bb9d SHA256 d08a2eb45917d69adac706fad5bbe7487be48846c402395ec0bca5e280dedcdc
 DIST ndiswrapper-1.45.tar.gz 197938 RMD160 33365872aca5714969a168abd0d881c42756d0d7 SHA1 2f5e35165035ff277044a66cf9092f837e5c2ab5 SHA256 13ae9d39d34980b9eedd5e4037398cd1396897b513b1a827a5cd2aba2fe7a4a8
+DIST ndiswrapper-1.46.tar.gz 198155 RMD160 dcabd6e83f351c397dc40285ce2a2814d16e411f SHA1 9f3143bff6b12e2ec509eb44b2256f0ed772464a SHA256 84971a43e560177ab837cd231eeb20af50e7bb84c82ea510754ac220efbf383d
 EBUILD ndiswrapper-1.33.ebuild 3052 RMD160 c21914747845eb8a5593d52080b1578a77c51105 SHA1 6befc41270a7bb87546ea0e0ba08b9bbb77483a3 SHA256 e0a915fb220093a6b82ba21d02e863ba5bb29d1560f30da18df0f45b0940bf6f
 MD5 34833426ea3ac4eb05afa3738df4a732 ndiswrapper-1.33.ebuild 3052
 RMD160 c21914747845eb8a5593d52080b1578a77c51105 ndiswrapper-1.33.ebuild 3052
@@ -70,10 +75,14 @@ EBUILD ndiswrapper-1.45.ebuild 2855 RMD160 b368ad6e516c3e267a162157e333d9ba5b9dc
 MD5 9929472e61ec7f5a3bc36e347f2ab247 ndiswrapper-1.45.ebuild 2855
 RMD160 b368ad6e516c3e267a162157e333d9ba5b9dc3f9 ndiswrapper-1.45.ebuild 2855
 SHA256 4a7c97af1b46d8ff1317d927844b8059815b09cdc760a303332979475c67b2ce ndiswrapper-1.45.ebuild 2855
-MISC ChangeLog 15270 RMD160 d9107a132366ebb38e616aea6dc4420899913f03 SHA1 1b9d02b23de2c5b3c736840c02d05810237f9c5e SHA256 556a1de699a0f4eb490caf0047aa48e59ed958d3c2e3b91aee6357374f17e1b7
-MD5 a723d0d5115c224fd818e7aa7f52b92b ChangeLog 15270
-RMD160 d9107a132366ebb38e616aea6dc4420899913f03 ChangeLog 15270
-SHA256 556a1de699a0f4eb490caf0047aa48e59ed958d3c2e3b91aee6357374f17e1b7 ChangeLog 15270
+EBUILD ndiswrapper-1.46.ebuild 2893 RMD160 b52489068bfcf83e176635aac119b5b92c23f632 SHA1 fd092d999b72418e60fd40321a9cb70041c3c4f5 SHA256 7f00b85d3fdb357720e9dd764308aeda412e3150aae224df9f0cf3bc0cfe1810
+MD5 26642b661844c251b1b032708e541774 ndiswrapper-1.46.ebuild 2893
+RMD160 b52489068bfcf83e176635aac119b5b92c23f632 ndiswrapper-1.46.ebuild 2893
+SHA256 7f00b85d3fdb357720e9dd764308aeda412e3150aae224df9f0cf3bc0cfe1810 ndiswrapper-1.46.ebuild 2893
+MISC ChangeLog 15437 RMD160 e7fc451b959255218f39ba3792227bdb15d8e0f2 SHA1 9dcb83de08b141f5a6a82fb2195f3b44fb926dd6 SHA256 3bc16175b0328174c7f8abd6b796203f4d96952af015658e3c27975cc58ea942
+MD5 af7e95953472e523bc14fdc637f1a16c ChangeLog 15437
+RMD160 e7fc451b959255218f39ba3792227bdb15d8e0f2 ChangeLog 15437
+SHA256 3bc16175b0328174c7f8abd6b796203f4d96952af015658e3c27975cc58ea942 ChangeLog 15437
 MISC metadata.xml 480 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 SHA1 14a2b92b64b18b0b79653fe64a9c282ae16331f2 SHA256 7ca20f317d16e17be26b34401258fc10ceb6d5698e89fc853fae59aa74cb0e66
 MD5 f878c9cae9bdd23eeb14c85860fc8d29 metadata.xml 480
 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 metadata.xml 480
@@ -117,10 +126,13 @@ SHA256 cac4438c3bf374008beca4c071575e6c06b3b6ee512cb8c6c26517a97a9ddbef files/di
 MD5 71f6fb3df82d2c2706a01d59812012be files/digest-ndiswrapper-1.45 250
 RMD160 7d474563b9c7b9c3a16c59fd82536efa1ebed135 files/digest-ndiswrapper-1.45 250
 SHA256 90d63bc63b9cb4d7380b7863281ea67eaf4b01e591dd58a0d851188b7c5140ba files/digest-ndiswrapper-1.45 250
+MD5 b2525045c9161ad0cc065bb1f9af18b7 files/digest-ndiswrapper-1.46 250
+RMD160 305f669c9070603075d4a20fbc1a765f8e89fd4c files/digest-ndiswrapper-1.46 250
+SHA256 69212c3b586d0e5576305454c7d9c1167695dfd7256624abd91620113a10ce95 files/digest-ndiswrapper-1.46 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGWzE9ppoStNGKGywRAniIAKCRQW8qzmU2johHuv6dwvkEVQ7f+wCdE20L
-XkYmnF29F0oensF53ocBTOI=
-=VsMq
+iD8DBQFGboDQppoStNGKGywRAv5JAJ9kSdkkaOYXzR1NtKyR1BJ4Kq2S2gCg1bYm
+yyxixCPX9Vjzgszoy0bBKnw=
+=3eb6
 -----END PGP SIGNATURE-----
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
+}