Version bump(1.35). Also finally add a correct patch for suspend2(already in ndiswrap...

Package-Manager: portage-2.1.2-r4

diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index b93d5703a36b9d8bb1e62710fb9f334680c00cf5..2dac9312bb9cfa94440a0b1970bfbd5c4eab0641 100644 (file)
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,14 @@
 # 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.70 2007/01/11 17:11:35 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.71 2007/01/28 17:45:20 peper Exp $
+
+*ndiswrapper-1.35 (28 Jan 2007)
+
+  28 Jan 2007; Piotr Jaroszyński <peper@gentoo.org>
+  +files/ndiswrapper-new_suspend2.patch, ndiswrapper-1.33.ebuild,
+  ndiswrapper-1.34.ebuild, +ndiswrapper-1.35.ebuild:
+  Version bump(1.35).
+  Also finally add a correct patch for suspend2(already in ndiswrapper svn).
 
   11 Jan 2007; Piotr Jaroszyński <peper@gentoo.org>
   -files/ndiswrapper-1.2-kernel-2.6.14.patch,

diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index a7e095bb6d59fbcd248eef7509776b23997d5fa5..bbb73e434d53559e223efa03c49b0268a5fccb4e 100644 (file)
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,20 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+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
+SHA256 dec61532d2c7eec07f387681616026e0472bc1d9024785a1bb5178769f6c2e5c files/ndiswrapper-new_suspend2.patch 891
 DIST ndiswrapper-1.33.tar.gz 189876 RMD160 bc4f94886e174b3f6276e1832aae61a63e2420f6 SHA1 d08bdef9dd8b656607c546b7f198bd89257213d2 SHA256 89658cbea3a1e23190d6ced024d016fb28269e09cdcb44093750851763aa1ad4
 DIST ndiswrapper-1.34.tar.gz 190156 RMD160 a6041f32a6e2ead26a824d97c665f356545fe982 SHA1 65ff79ab7fb9eab1fee88f9f1401605c8befe9b0 SHA256 a096802bc6b01f01c4a950efd9db127227f34f4adc77fdbb8fe49a48ac43a9ae
-EBUILD ndiswrapper-1.33.ebuild 3019 RMD160 25428a06931655e6d1ec9423cf4dadc952d16fd7 SHA1 49541291a0fd12427a27ac67d2b0ac1a74a335fb SHA256 66b03b6263e2f5ab09fdb85a68119c7ff1f7d240ea966d8e34c970fbf53bf4ec
-MD5 658ee7821ef70e56c03eaf47a27ea232 ndiswrapper-1.33.ebuild 3019
-RMD160 25428a06931655e6d1ec9423cf4dadc952d16fd7 ndiswrapper-1.33.ebuild 3019
-SHA256 66b03b6263e2f5ab09fdb85a68119c7ff1f7d240ea966d8e34c970fbf53bf4ec ndiswrapper-1.33.ebuild 3019
-EBUILD ndiswrapper-1.34.ebuild 3020 RMD160 f57221b89ff0e979587906566964d4cc94db6e5b SHA1 db43101d6c71fe3bf2939d2932d3f182ad1b96b0 SHA256 b84cdf7931fb8022f171a70a5644bf1f9455982429528c3d705d7b0460501413
-MD5 d5b8972a72d537737e809a1b361abb76 ndiswrapper-1.34.ebuild 3020
-RMD160 f57221b89ff0e979587906566964d4cc94db6e5b ndiswrapper-1.34.ebuild 3020
-SHA256 b84cdf7931fb8022f171a70a5644bf1f9455982429528c3d705d7b0460501413 ndiswrapper-1.34.ebuild 3020
-MISC ChangeLog 12969 RMD160 2f8a5079b24d14c1f90f24984531c5744553c2ac SHA1 285085921a5e74d307057187529cd5dcf6d9a997 SHA256 66393c60d61645dc786a6e5a8512bed2196fd9af56103a851a771806186ad733
-MD5 72c9167791dd7fa41302dc6fc351ec66 ChangeLog 12969
-RMD160 2f8a5079b24d14c1f90f24984531c5744553c2ac ChangeLog 12969
-SHA256 66393c60d61645dc786a6e5a8512bed2196fd9af56103a851a771806186ad733 ChangeLog 12969
+DIST ndiswrapper-1.35.tar.gz 191277 RMD160 ffbd196a22bd6a432157df4e2d0ec203ff6dc250 SHA1 3e7e2b632dadec6ec70681c0d4e4d7d0ca1366b1 SHA256 d4f396d9dafe94fec374df4ff68283b1078d2c17de86bb430af68390cd0f999c
+EBUILD ndiswrapper-1.33.ebuild 3264 RMD160 d4b20c78acda866559d1abb1d46729f0424d4f58 SHA1 282d5cbb78545e09d4e20cecb8ecc0233b6b0755 SHA256 a7803d883ba2b3b28f9182aa20fab02a4c4afe57a06c19ab5b35e5f25188091c
+MD5 e9f5394511da495df14686ce9bbb077c ndiswrapper-1.33.ebuild 3264
+RMD160 d4b20c78acda866559d1abb1d46729f0424d4f58 ndiswrapper-1.33.ebuild 3264
+SHA256 a7803d883ba2b3b28f9182aa20fab02a4c4afe57a06c19ab5b35e5f25188091c ndiswrapper-1.33.ebuild 3264
+EBUILD ndiswrapper-1.34.ebuild 3265 RMD160 1ec49fa6a35a238f4b35d3cc0d279ee270553a8a SHA1 4e28cd6b6a12092fb872b640ad440968efcafff7 SHA256 9c1a362a7b81d662fcd5289341e25a119ffd6dff4f89daaf12d69c6fbbd4d9e6
+MD5 486ab3b786c8e1a9e057a3307f35717a ndiswrapper-1.34.ebuild 3265
+RMD160 1ec49fa6a35a238f4b35d3cc0d279ee270553a8a ndiswrapper-1.34.ebuild 3265
+SHA256 9c1a362a7b81d662fcd5289341e25a119ffd6dff4f89daaf12d69c6fbbd4d9e6 ndiswrapper-1.34.ebuild 3265
+EBUILD ndiswrapper-1.35.ebuild 3265 RMD160 890b549263964a47afe232f96b872ee092bd5ddf SHA1 d96fcfe11c8523bac00f8ee2a19039716cf7ba9b SHA256 623ea0092597588fabe2bbfa9cb05a24fb5edd854b699414e7b9330539d9593e
+MD5 dd27873e604e40a7d3d9425b93c5676e ndiswrapper-1.35.ebuild 3265
+RMD160 890b549263964a47afe232f96b872ee092bd5ddf ndiswrapper-1.35.ebuild 3265
+SHA256 623ea0092597588fabe2bbfa9cb05a24fb5edd854b699414e7b9330539d9593e ndiswrapper-1.35.ebuild 3265
+MISC ChangeLog 13274 RMD160 035658383adeab176c6d45817733e71f8731c739 SHA1 9a4b7f6eb64163f43ec26f867fb1092fadee4e98 SHA256 bbeb9c8b1d8bb83b8c3ef13b7956965ec04ed499ef44034de38fffa1f2010a21
+MD5 a1bdd6bc9c88b98c0acdf57e02560460 ChangeLog 13274
+RMD160 035658383adeab176c6d45817733e71f8731c739 ChangeLog 13274
+SHA256 bbeb9c8b1d8bb83b8c3ef13b7956965ec04ed499ef44034de38fffa1f2010a21 ChangeLog 13274
 MISC metadata.xml 480 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 SHA1 14a2b92b64b18b0b79653fe64a9c282ae16331f2 SHA256 7ca20f317d16e17be26b34401258fc10ceb6d5698e89fc853fae59aa74cb0e66
 MD5 f878c9cae9bdd23eeb14c85860fc8d29 metadata.xml 480
 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 metadata.xml 480
@@ -25,10 +34,13 @@ SHA256 e618e62c29132f3202d24d9edf51c9164056d88d55ae52e87c926b39b85f68ad files/di
 MD5 a7fab6789db9967b0d9cab3892d1d521 files/digest-ndiswrapper-1.34 250
 RMD160 69361fdf276fabae7684786eba75a927e3cfdc87 files/digest-ndiswrapper-1.34 250
 SHA256 ea986a475baf568220320de6fe7a0e6c0cdfa5765f4141f8b8ec9b7ade3c1162 files/digest-ndiswrapper-1.34 250
+MD5 05d70ec8df1a38db51f2b267f26f5516 files/digest-ndiswrapper-1.35 250
+RMD160 fbd3a20c28d7c8af101c5fd9fa6531baa358892c files/digest-ndiswrapper-1.35 250
+SHA256 b8052d4bda79665b1f9fecb1442a6ecc565724b0ec35b6a371f9181f819097a7 files/digest-ndiswrapper-1.35 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFpm/OppoStNGKGywRAtdOAJ4upJ9Hw1izCudxDYCLTzDeZ7y4ogCg1JgQ
-Dlr/SAwMYlsxf8gnpJdnHes=
-=Z+cF
+iD8DBQFFvOE7ppoStNGKGywRAtInAJ9SfR6YfGqXXoL7YprkyS1k80FEbACeOjhT
+OO/5SLJ/HAp/mw+KncNWaVo=
+=Q32l
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.35 b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.35
new file mode 100644 (file)
index 0000000..de7fe6d
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/digest-ndiswrapper-1.35
@@ -0,0 +1,3 @@
+MD5 bd6aa8e6a513cf727ba7674959a6cff4 ndiswrapper-1.35.tar.gz 191277
+RMD160 ffbd196a22bd6a432157df4e2d0ec203ff6dc250 ndiswrapper-1.35.tar.gz 191277
+SHA256 d4f396d9dafe94fec374df4ff68283b1078d2c17de86bb430af68390cd0f999c ndiswrapper-1.35.tar.gz 191277

diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-new_suspend2.patch b/net-wireless/ndiswrapper/files/ndiswrapper-new_suspend2.patch
new file mode 100644 (file)
index 0000000..1936010
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-new_suspend2.patch
@@ -0,0 +1,26 @@
+--- driver/ntoskernel.h.old    2007-01-28 17:14:51.000000000 +0100
++++ driver/ntoskernel.h        2007-01-28 17:34:14.000000000 +0100
+@@ -348,12 +348,6 @@
+ #define pci_choose_state(dev, state) (state)
+ #endif
+ 
+-#if defined(CONFIG_SOFTWARE_SUSPEND2) || defined(CONFIG_SUSPEND2)
+-#define KTHREAD_RUN(a,b,c) kthread_run(a,b,0,c)
+-#else
+-#define KTHREAD_RUN(a,b,c) kthread_run(a,b,c)
+-#endif
+-
+ #if !defined(HAVE_NETDEV_PRIV)
+ #define netdev_priv(dev)  ((dev)->priv)
+ #endif
+--- driver/ntoskernel.c.old    2007-01-28 16:09:21.000000000 +0100
++++ driver/ntoskernel.c        2007-01-28 17:22:03.000000000 +0100
+@@ -1911,7 +1911,7 @@
+       }
+       DBGTRACE2("created task: %d", pid);
+ #else
+-      task = KTHREAD_RUN(thread_trampoline, &thread_info, "windisdrvr");
++      task = kthread_run(thread_trampoline, &thread_info, "windisdrvr");
+       if (IS_ERR(task)) {
+               free_object(thread_info.thread);
+               TRACEEXIT2(return STATUS_FAILURE);

diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild
index b65010807b3c56a7b64db488bb21a88f146956f6..4f9fc267262d25da4c510684e523a7e2fc5c56ee 100644 (file)
--- a/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild
@@ -1,8 +1,8 @@
 # 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.33.ebuild,v 1.3 2007/01/11 17:11:35 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.33.ebuild,v 1.4 2007/01/28 17:45:20 peper Exp $
 
-inherit linux-mod
+inherit eutils linux-mod
 
 DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
 HOMEPAGE="http://ndiswrapper.sourceforge.net/"
@@ -36,6 +36,8 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
+       # New patch for suspend2 kernels - peper
+       epatch "${FILESDIR}/${PN}-new_suspend2.patch"
 
        convert_to_m "${S}/driver/Makefile"
 }
@@ -95,6 +97,9 @@ pkg_postinst() {
        einfo "for the FAQ, HowTos, Tips, Configuration, and installation"
        einfo "information."
        echo
+       einfo "ndiswrapper devs need support(_hardware_, cash)."
+       einfo "Don't hesistate if you can help, see http://ndiswrapper.sf.net for details."
+       echo
 
        einfo "Attempting to automatically reinstall any Windows drivers"
        einfo "you might already have."

diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild
index 36e86c61fc2cd392a697d348e85280366242fa5b..8499241f6b68c33d98f96d73d1ea8b4b20e2c120 100644 (file)
--- a/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild
@@ -1,15 +1,15 @@
 # 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.34.ebuild,v 1.2 2007/01/11 17:11:35 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.34.ebuild,v 1.3 2007/01/28 17:45:20 peper Exp $
 
-inherit linux-mod
+inherit eutils 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="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug usb"
 
 DEPEND="sys-apps/pciutils"
@@ -36,6 +36,8 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
+       # New patch for suspend2 kernels - peper
+       epatch "${FILESDIR}/${PN}-new_suspend2.patch"
 
        convert_to_m "${S}/driver/Makefile"
 }
@@ -95,6 +97,9 @@ pkg_postinst() {
        einfo "for the FAQ, HowTos, Tips, Configuration, and installation"
        einfo "information."
        echo
+       einfo "ndiswrapper devs need support(_hardware_, cash)."
+       einfo "Don't hesistate if you can help, see http://ndiswrapper.sf.net for details."
+       echo
 
        einfo "Attempting to automatically reinstall any Windows drivers"
        einfo "you might already have."

diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.35.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.35.ebuild
new file mode 100644 (file)
index 0000000..6a5ef31
--- /dev/null
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.35.ebuild
@@ -0,0 +1,112 @@
+# 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.35.ebuild,v 1.1 2007/01/28 17:45:20 peper Exp $
+
+inherit eutils 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="NET_RADIO"
+
+MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
+BUILD_PARAMS="KSRC=${ROOT}${KV_DIR} KVERS=${KV_FULL}"
+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() {
+       einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml for a list of supported kernels."
+       echo  ""
+       use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
+       linux-mod_pkg_setup
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       # New patch for suspend2 kernels - peper
+       epatch "${FILESDIR}/${PN}-new_suspend2.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 trick needed to build against sources where only make
+       # modules_prepare has been run so /lib/modules/$(uname -r) does
+       # not exists yet
+       # KBUILD value can't be quoted or amd64 fails
+       # http://bugs.gentoo.org/show_bug.cgi?id=156319
+       BUILD_PARAMS="KBUILD=${KV_OUT_DIR} ${BUILD_PARAMS} ${params} -j1" linux-mod_src_compile
+}
+
+src_install() {
+       dodoc README INSTALL AUTHORS ChangeLog
+       doman ndiswrapper.8
+
+       keepdir /etc/ndiswrapper
+
+       linux-mod_src_install
+
+       cd utils
+       emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+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 'modules-update'."
+       echo
+       einfo "check http://ndiswrapper.sf.net/mediawiki/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
+       einfo "ndiswrapper devs need support(_hardware_, cash)."
+       einfo "Don't hesistate if you can help, see http://ndiswrapper.sf.net for details."
+       echo
+
+       einfo "Attempting to automatically reinstall any Windows drivers"
+       einfo "you might already have."
+       for driver in $(ls /etc/ndiswrapper)
+       do
+               einfo "Driver: ${driver}"
+               mv /etc/ndiswrapper/${driver} ${T}
+               ndiswrapper -i ${T}/${driver}/${driver}.inf
+       done
+}