Add 1.50_rc1 with a small Makefile patch, which was already accepted upstream.

Package-Manager: portage-2.1.3.19

5 files changed, 168 insertions, 8 deletions

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 59242c7853fc..9b1903a019e5 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.95 2007/10/28 12:01:56 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.96 2007/11/21 02:59:38 peper Exp $
+
+*ndiswrapper-1.50_rc1 (21 Nov 2007)
+
+  21 Nov 2007; Piotr Jaroszyński <peper@gentoo.org>
+  +files/ndiswrapper-1.50_rc1-makefile.patch, +ndiswrapper-1.50_rc1.ebuild:
+  Add 1.50_rc1 with a small Makefile patch, which was already accepted upstream.
 
 *ndiswrapper-1.49 (28 Oct 2007)
 
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index 53a2e2996a8e..6e100d2d0441 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -9,6 +9,10 @@ AUX ndiswrapper-1.47-ksrc.patch 592 RMD160 ac2831b9f676ab4348875f4fae3e54b99b151
 MD5 0e80d5efadbf9b8eb6e5eeb638a95575 files/ndiswrapper-1.47-ksrc.patch 592
 RMD160 ac2831b9f676ab4348875f4fae3e54b99b151790 files/ndiswrapper-1.47-ksrc.patch 592
 SHA256 38cc21054be40c047c8135d4eb009dd72573a4fa7edb8ee310769e5c54ee16c1 files/ndiswrapper-1.47-ksrc.patch 592
+AUX ndiswrapper-1.50_rc1-makefile.patch 600 RMD160 f8b4f17ba938538303e6c895711933a9464f99cb SHA1 ab868623df14704eb4e09cda7cc7b03801afe09b SHA256 8188c4eb1d6ca8353e3c3de27803563c96db5607492e23ef71bcfbdad9336648
+MD5 c2c346888a4713dd24c60e9bcd165fe1 files/ndiswrapper-1.50_rc1-makefile.patch 600
+RMD160 f8b4f17ba938538303e6c895711933a9464f99cb files/ndiswrapper-1.50_rc1-makefile.patch 600
+SHA256 8188c4eb1d6ca8353e3c3de27803563c96db5607492e23ef71bcfbdad9336648 files/ndiswrapper-1.50_rc1-makefile.patch 600
 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
@@ -22,6 +26,7 @@ DIST ndiswrapper-1.49rc1.tar.gz 200113 RMD160 e46242202f1b98b7cda308c06047092bfb
 DIST ndiswrapper-1.49rc2.tar.gz 199671 RMD160 6557f7985cabae66f2bb218e0cce655ab53415db SHA1 58de3827a634288defcdf78b7b67ec4645cacd91 SHA256 db6c996d4cea0001278b384f411bd1b5b04a9752db9f110a9f7caf83ac815a6d
 DIST ndiswrapper-1.49rc3.tar.gz 199990 RMD160 86f2b74dd0cbe048831c29dab1450eacd8cc70b7 SHA1 1f85ce29508a3772d69b428073d6b8134d514be9 SHA256 c7bd7c2da57c2c98b3c9c2147973ffb39c9c3c68e493a07e0b1eb46c5e728fda
 DIST ndiswrapper-1.49rc4.tar.gz 199974 RMD160 9fc9eaad7c0da1e43cc3840bd6171bf465dc1b00 SHA1 9402ecd341eef8f027ed10aa9ec26ca069673b32 SHA256 8ea97bf00f7326547e585d6b5a167a3494278e74fbaa66d074fdbae887c7462b
+DIST ndiswrapper-1.50rc1.tar.gz 198040 RMD160 6689748ffa4015b3c61576b6bf6f45860b07021a SHA1 741f18b3087ab3442e22c53672330de68126078a SHA256 b2ae7d838ac7a4ba55a82272f3684c88d6843e1ced5a2c1e399d220200d7e37d
 EBUILD ndiswrapper-1.47.ebuild 2937 RMD160 438c7c626e840c9d456870e34e6e5f5d58d40026 SHA1 f4567ef957cfe9fabe82cf8348bb99cce28e9c6a SHA256 673a0d94ae61ab5472fa0929e269ddfd81368b34f0edb4c3d7e7b5ddfe26b464
 MD5 74b8fe26b4e7bf3c1023cc7857984610 ndiswrapper-1.47.ebuild 2937
 RMD160 438c7c626e840c9d456870e34e6e5f5d58d40026 ndiswrapper-1.47.ebuild 2937
@@ -58,10 +63,14 @@ EBUILD ndiswrapper-1.49_rc4.ebuild 2950 RMD160 0a5bd7fc8c42fa9b8e9ffce228f6eb825
 MD5 b60ff621c7ba7d46039ea4e3129fcd1d ndiswrapper-1.49_rc4.ebuild 2950
 RMD160 0a5bd7fc8c42fa9b8e9ffce228f6eb8259810a6a ndiswrapper-1.49_rc4.ebuild 2950
 SHA256 02bdfcb7bca398b4b24b6499abc9e724f44c4a10123559dbd3eed6af7d21d9e9 ndiswrapper-1.49_rc4.ebuild 2950
-MISC ChangeLog 17342 RMD160 f2ac1bb11c8345ae9b0187a921c85389cccade9f SHA1 433f243822dd50ec6836bcf2c7bc468f112415a6 SHA256 a3f5f0be8ae97c3b36cefe4716f1e6da3d763fe264b33828f7f5e2118e97aa18
-MD5 b10208fb5c33d8a3b0b21623b00d5438 ChangeLog 17342
-RMD160 f2ac1bb11c8345ae9b0187a921c85389cccade9f ChangeLog 17342
-SHA256 a3f5f0be8ae97c3b36cefe4716f1e6da3d763fe264b33828f7f5e2118e97aa18 ChangeLog 17342
+EBUILD ndiswrapper-1.50_rc1.ebuild 3004 RMD160 5c13f483a4dbfc4bcfa8a11c66e8c2bff6f043e6 SHA1 977ac624208ea7cef6fde4180357e8a049035e48 SHA256 2554aca0c315586eb3ec5cf8732aad113a68b99c0c5e63d5f28c2e0bd812a24d
+MD5 10e573cfb51e321df1b8aa4498d4c7d6 ndiswrapper-1.50_rc1.ebuild 3004
+RMD160 5c13f483a4dbfc4bcfa8a11c66e8c2bff6f043e6 ndiswrapper-1.50_rc1.ebuild 3004
+SHA256 2554aca0c315586eb3ec5cf8732aad113a68b99c0c5e63d5f28c2e0bd812a24d ndiswrapper-1.50_rc1.ebuild 3004
+MISC ChangeLog 17590 RMD160 a4cd592bc4405596595374a6323ef592c4458bf2 SHA1 454f510c99ba5e8daed5cdb647cb34f3c68acfa0 SHA256 9f6bd1802811d486e38d0f0e0d2b2d6557f239179134d7f53f847e4d8b134163
+MD5 d05fe5f88bb4e13cabe4d444ed73e6ab ChangeLog 17590
+RMD160 a4cd592bc4405596595374a6323ef592c4458bf2 ChangeLog 17590
+SHA256 9f6bd1802811d486e38d0f0e0d2b2d6557f239179134d7f53f847e4d8b134163 ChangeLog 17590
 MISC metadata.xml 480 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 SHA1 14a2b92b64b18b0b79653fe64a9c282ae16331f2 SHA256 7ca20f317d16e17be26b34401258fc10ceb6d5698e89fc853fae59aa74cb0e66
 MD5 f878c9cae9bdd23eeb14c85860fc8d29 metadata.xml 480
 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 metadata.xml 480
@@ -93,10 +102,13 @@ SHA256 f1dc1b091d54c3804d1ce4ba901939d8e02e2e956691c1273c9af6772cdd34f4 files/di
 MD5 36c1ff6c1db24675761c477ba152064e files/digest-ndiswrapper-1.49_rc4 259
 RMD160 56d63e5d6923a8ee027db6bc1007e4c9c1bcc357 files/digest-ndiswrapper-1.49_rc4 259
 SHA256 299c7b14da1aab1dd09c95b90cb1dbbb5dd6c2bee444b9a0e1697544378a1f9d files/digest-ndiswrapper-1.49_rc4 259
+MD5 2d6b49e6dac646cc8814936db856cd59 files/digest-ndiswrapper-1.50_rc1 259
+RMD160 ff9ccdb9a673247c8963fd0226d3cad6074d6b1e files/digest-ndiswrapper-1.50_rc1 259
+SHA256 75d2d2d63f9b6cd2d1c66ed43a68ecfe20d6baf0797d24d5d55e059e00b8c23e files/digest-ndiswrapper-1.50_rc1 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHJHo6ppoStNGKGywRAhYUAKCZ5SvXq5R+sb4QVuTfB+D7pNaZZwCePt+G
-yywBIUIaiyGop/UJPFFrntk=
-=+S47
+iD8DBQFHQ57pppoStNGKGywRAkz6AJ9dTrs824h7dm6BF8afSFy7R3yi4gCeMbgh
+D6Yrj8dhPgdOgF2n+85Mcv8=
+=QYwm
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.50_rc1 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.50_rc1
new file mode 100644
index 000000000000..93fdb3858715
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.50_rc1
@@ -0,0 +1,3 @@
+MD5 aeb6f7c13c0987707de3f88b7155270c ndiswrapper-1.50rc1.tar.gz 198040
+RMD160 6689748ffa4015b3c61576b6bf6f45860b07021a ndiswrapper-1.50rc1.tar.gz 198040
+SHA256 b2ae7d838ac7a4ba55a82272f3684c88d6843e1ced5a2c1e399d220200d7e37d ndiswrapper-1.50rc1.tar.gz 198040
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.50_rc1-makefile.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.50_rc1-makefile.patch
new file mode 100644
index 000000000000..416b300a38aa
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.50_rc1-makefile.patch
@@ -0,0 +1,15 @@
+--- ndiswrapper-1.50rc1/driver/Makefile.org	2007-11-21 03:38:46.000000000 +0100
++++ ndiswrapper-1.50rc1/driver/Makefile	2007-11-21 03:38:50.000000000 +0100
+@@ -322,10 +322,10 @@
+ distclean: clean
+ 	rm -f *_exports.h .\#* win2lin_stubs.h built-in.o
+ 
+-flags := $(shell if grep -qw "EXTRA_CFLAGS" $(KBUILD)/scripts/Makefile.build; \
++cflags_var := $(shell if grep -qw "EXTRA_CFLAGS" $(KSRC)/scripts/Makefile.build; \
+ 		             then echo "EXTRA_CFLAGS"; else echo "CFLAGS"; fi)
+ 
+-ifeq ($(flags), CFLAGS)
++ifeq ($(cflags_var), CFLAGS)
+ CFLAGS += $(MOD_CFLAGS)
+ else
+ EXTRA_CFLAGS += $(MOD_CFLAGS)
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.50_rc1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.50_rc1.ebuild
new file mode 100644
index 000000000000..56f89e67cf3d
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.50_rc1.ebuild
@@ -0,0 +1,124 @@
+# 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.50_rc1.ebuild,v 1.1 2007/11/21 02:59:38 peper Exp $
+
+inherit linux-mod
+
+MY_P=${PN}-${PV/_/}
+
+DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
+HOMEPAGE="http://ndiswrapper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_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"
+
+S=${WORKDIR}/${MY_P}
+
+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}
+	convert_to_m "${S}/driver/Makefile"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+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
+
+	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
+}