summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2014-03-22 11:49:07 +0000
committerChristoph Mende <angelos@gentoo.org>2014-03-22 11:49:07 +0000
commit1bead9a8d2dc8794f2d4af027372ba984bb971df (patch)
treeeaabdbaf1b7e3f93e6f881c60dcd2995cb27c312 /net-wireless/ndiswrapper
parentNew release - remove need to modify .bashrc (diff)
downloadhistorical-1bead9a8d2dc8794f2d4af027372ba984bb971df.tar.gz
historical-1bead9a8d2dc8794f2d4af027372ba984bb971df.tar.bz2
historical-1bead9a8d2dc8794f2d4af027372ba984bb971df.zip
Version bump, remove old
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Diffstat (limited to 'net-wireless/ndiswrapper')
-rw-r--r--net-wireless/ndiswrapper/ChangeLog13
-rw-r--r--net-wireless/ndiswrapper/Manifest23
-rw-r--r--net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.35.patch90
-rw-r--r--net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch29
-rw-r--r--net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.38.patch24
-rw-r--r--net-wireless/ndiswrapper/files/ndiswrapper-1.56-ldflags.patch13
-rw-r--r--net-wireless/ndiswrapper/files/ndiswrapper-1.59-cflags.patch13
-rw-r--r--net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild116
-rw-r--r--net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild (renamed from net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild)10
9 files changed, 33 insertions, 298 deletions
diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog
index 76eeb7d79b11..febaa7cd0e0c 100644
--- a/net-wireless/ndiswrapper/ChangeLog
+++ b/net-wireless/ndiswrapper/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for net-wireless/ndiswrapper
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.130 2013/05/19 16:54:31 angelos Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.131 2014/03/22 11:49:03 angelos Exp $
+
+*ndiswrapper-1.59 (22 Mar 2014)
+
+ 22 Mar 2014; Christoph Mende <angelos@gentoo.org>
+ +files/ndiswrapper-1.59-cflags.patch, +ndiswrapper-1.59.ebuild,
+ -files/ndiswrapper-1.56-2.6.35.patch, -files/ndiswrapper-1.56-2.6.36.patch,
+ -files/ndiswrapper-1.56-2.6.38.patch, -files/ndiswrapper-1.56-ldflags.patch,
+ -ndiswrapper-1.57.ebuild, -ndiswrapper-1.58_rc1.ebuild:
+ Version bump, remove old
19 May 2013; Christoph Mende <angelos@gentoo.org>
+files/ndiswrapper-1.58-3.9.patch, ndiswrapper-1.58.ebuild:
diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest
index a255eea98d5f..c60d9ac367eb 100644
--- a/net-wireless/ndiswrapper/Manifest
+++ b/net-wireless/ndiswrapper/Manifest
@@ -1,24 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX ndiswrapper-1.56-2.6.35.patch 3369 SHA256 d96cd5e7edbbe578b935394b7030a8de1f0e8c031662824021d30b2146c8dbf9 SHA512 434cb18fb6390ab3f349a94684b5f6ec44314fcd81e74b4ef200e66e1085d3d644f4b761249c0da4f86a73487f213e8b27683a7077f2bd2dee9e16a21da60a89 WHIRLPOOL af4705f1245755cc8224b057cea3c7f5ec6db3eab88d7324fa40ecbfac32151bd5f19cea5ff284b3e556a21e4740ad3cf435eecad1294040e0c2f75268783752
-AUX ndiswrapper-1.56-2.6.36.patch 756 SHA256 cd115553bc4caf9b53d2ca20259399547cc2b2519586c9c63f80b5e5ad6bf2ef SHA512 ebc96e732e963a6fcb57e2f8c83a72ff131fa8b2bd2ba275bd31b8da90d97468482a42d078257dc9dedfed9ec700f0150963d41c8ead665179e24de469cf689e WHIRLPOOL 55c84919d88a6bb13dc3026f5c003036ec36deaca67fc3b86b0b37d66893cab39bb6406b7f343197689c885272fac444d226d96358ab702c09b56cc80f6793a5
-AUX ndiswrapper-1.56-2.6.38.patch 563 SHA256 392aed822cafcac3a365812c4bdab6eee43a13e63960c7f06b193034215f0dc1 SHA512 8144b293d5a9560853f3d54cda84888d418aac53a830f1a075b5343965897396c07d35d4c8e78e56d61bfd411f20fc6b9c1e1ea22a416058ad309c4e8c9e27a2 WHIRLPOOL d20e430e5252b742767d53b7106feec8b90fd3005c5b05036453676fe7793dc4cbb92f0558f0619295fb28c09bafd8471dd02436278d574cc9f9463935e5102c
AUX ndiswrapper-1.56-cflags.patch 421 SHA256 aa6192da73358cc0db1ff5a234537245e5f60ef06a4a73c1090190db25404595 SHA512 b06961d57c59a8357303784705dff4f614705bd2cbca698b046be6db969eb1efb9c7bf6ad3b38151e4b973f6f4660356f3bbe44eb928402f7ef4ba47a1c5b562 WHIRLPOOL 38902c0d69a2182181dddd1947688e4046b4e1789e1bad35c604d6ff7ed8eae88d2a880451912f1129134069ea4bd177ec9eaeceecb7cdfa83eb03fdd7334bf1
-AUX ndiswrapper-1.56-ldflags.patch 365 SHA256 d17f6d84b1dddbe2da2c35370e20ea51e1802e74496918fed4648cf0af66c304 SHA512 76bb0a2aaf743812dd258bae253b95df40799fdfd31c5ccb0b41a899dc74b2b7940a47a54dfb493dd35505de981819f872cb5894649e4edb0728cfb84ed310bd WHIRLPOOL 870ae6b98ce9860041af6355f520d345df37d1c7bbf71b34faedc3c55beb01df5d28995c85b4fcc216d81bbed96b761c0325564447a24eb5d30f40ba292c1248
AUX ndiswrapper-1.58-3.9.patch 1026 SHA256 bef0c73c3e936a9b9f57cdb94c3af4b70f229ed73a80491f55b0b82b5e0ee090 SHA512 dd8f74f6e59de567a76d009ed54fed62fb2943af74fea7818e12c3021ed0a9caf3b980eb0a57fb6b84e052145fef2a32897f0611f65d1a58fc68f4219cad5d5c WHIRLPOOL 5131acb24076baf43f9657c847c482a778c1d6f889a00b91a275c4e77e8df8915e198df30a7bda0658bd7d8dfceceb39bcc50e5b8e2a23ebb899215b20ae3a1d
-DIST ndiswrapper-1.57.tar.gz 198971 SHA256 208699faa01ab8ca707cb8a28db20417d07887f993c0830dd34c7d9c4f84a56c
+AUX ndiswrapper-1.59-cflags.patch 357 SHA256 3f1c98336b5ef582db9556c9f2b9b459084eafb1bedb639c2cb795fcda958919 SHA512 8c65a5af71bf3035e2d784b29ad45dc48bd70b155d988c2e6d511eb03d9a319d355d67f74e3270816e943abe051e442efe891de1d649e871b7e3b05690c71a9d WHIRLPOOL 6b14014639e1f8e275feae73bcc7b009cc46f52379cb2c5bf456bfddd453d567afac8eb97734950c39dc6d015ed2e2f194618b64d8a894e343affb7ab622e8fc
DIST ndiswrapper-1.58.tar.gz 199065 SHA256 cbd225ecb0b835be7d05012483f61518fe97a52c67f20b35846412c692be24aa SHA512 161e87df13143841ff29f424e979cd9648a0022f0ad74c1189e398c832f5c4a77834fc9dde941c8202773064f2b312968c21b39c5023167fb67ae67ebd86795a WHIRLPOOL ffa5d625ddac2b58b45415eea0713666e77ec1806830921bf605c1f28a16239f367c78abe9af8d895647b577868e2f57581eb37d94e498d8a11c53afce586031
-DIST ndiswrapper-1.58rc1.tar.gz 199506 SHA256 b56dee9d627e64331201bc66d234581abf73ca5663bc369d05f88dd16639830a SHA512 15273174976e31f2cb7f016e88c0bc94764c9147032429f1282f14cb5f75761816906907e3f1a0f28c024d4caa237e841c0541bb3a9665a72046342bac6422dd WHIRLPOOL 2cb7868de6e3e465e029087a7f70b20e563b8ba2a943f6f512423bc7a00958959f320c8f928a4ea48d9dad88dada993f3677935a7c189348b698b32ad46a550b
-EBUILD ndiswrapper-1.57.ebuild 2860 SHA256 fdb53c13eb86f15eae78b6734d4b7a20f3037d84997084e37c2be6d24356705b SHA512 12abc6f173cf56a8b39509dc9fc24ef96af447a38ed4b8ab0048b0542ee4d7feec41ff4473df0d985da629ab3f979105eb337b452e81d91b2ef77e8d499d0d79 WHIRLPOOL d4051b33ef0654992a97eeff5a8d94e9de20e9380160a00fe49a47ebbbbdf8ac599082822351f10aeb0b89eb657df0f39e2b008fd775a825a5ff99ca95c0c34f
+DIST ndiswrapper-1.59.tar.gz 201257 SHA256 66a5d3ffb3fc8a63d87e381bbc627511597dfd25c4c37dda3b953ccf98f5d4bc SHA512 dd1d486b6178185e813217e4fff38f6ea6b21f8a3544c5cc25be9edbca60f34b21656e5d46b9d02cb1e43c8cc82856283aaa428964b8f85cb07146a41e40e44d WHIRLPOOL ae4dca59911625146de4e2da02b72bcf1b695e63c8d0d900a91ec9b0c5b7452c9ba0de37ad95129d330d96be16d9c4b488b5d40936f51af14dca2597281b7b84
EBUILD ndiswrapper-1.58.ebuild 2880 SHA256 ae6459c71c5c2435bc796a0bddd3e162bd14165b6596fca046b76b315c7fbbca SHA512 4fc1cb8c5a87aec4ffd4aeeda110bc0e1ca94c62c4830d21a795f80e7008f03b568c8cf2a33236c5c9bb6e2df2addea2130758263f38d87a3e5049745663c186 WHIRLPOOL a0d46f905b4cc86e935946980af3f726d74d8c1a87f89683a6cf900bcd9b04262d0f30b0e88b46ce1b9d026c2ca4b5592188adee180112ad902f877301e82ef9
-EBUILD ndiswrapper-1.58_rc1.ebuild 3121 SHA256 4d1b7e76d4d29f6ea95ec91514f62b14fe43eb1cc5ff8e61eec42e48f1a86932 SHA512 129d23fbaff3915736af958ca1606d090752a2d21a9217c7ed3adfabfa52913caaba37cc32cd98d23b260a99bf4b2324bde4e96786d5532956b9687343f25ab9 WHIRLPOOL c1721e2ad50512be8165761b08a36cbeff56015d0654869922ce0d4876c4252ac09886441fc68ec29776e871cc72159dcdf47472c49046d25a4ac5e7f9f4ea9b
-MISC ChangeLog 22664 SHA256 cf17ed3646eb0eff158331f709578e1cf66ca8d3f8bc7ed2ab3d08b1598b840c SHA512 663c2121fe64b0331ee9dcf2e6f6de3f77f2130e4e9d54d13a28378b31bbceda235c00d8156a5d1246a8af4d546305836ba43eef63ed91180fc4d0ec286a1abc WHIRLPOOL 0a787af833e24ce13aa261757ee6466b5366a6203e078d528f6ff78f3ab0a5405bbfd8f99a619e67b17d7964a2293d8546e41cd62f59676d56d4afbd4e03fd9e
+EBUILD ndiswrapper-1.59.ebuild 2847 SHA256 85d3b00b13362fb21aeb7b9f220fe5f58f06b95093aa97e7c7d4e69f4d9ff58f SHA512 44c7b08054109de9800ecde04126ec12ac59766f68929ae4c08db43f190d98a5e40babfc966705669ba246bac5ab9ef99fb9add70dc0ab4e704881a877d4716b WHIRLPOOL 16a7e96683df3cf5809a78eb9377ccaeb1d37d692d190bb90392d76be9e74c1029b830a32f8240aff23b5652a43a1e41f7bf18e91d0696f135d6c027c4797161
+MISC ChangeLog 23058 SHA256 c9937a2afe354be915799ef81fa319742f5004286a045f2fa7809f22f923dba1 SHA512 10e69ac580d925cdbf46b3d30ce2f338f2cf21650c3e335c42bf148e72be8430ceb1bfcf9870aa6de1ef432bf3658400eeed3d50d9094102ec4ca9c467976261 WHIRLPOOL e5e9a2010ad7327a6ec19487555adba32aec4f66ad809f961b2cd6acb61231fef0b339fe9adc687790154691669e8365c1f379cfb3998d08f22ad3c3b7c0b7a7
MISC metadata.xml 458 SHA256 918f28df787928f1c599f290e325d4ba68a89c728a8ad65542a129298f2f8779 SHA512 98486e5a9129d0b2bd7c6ecef286b1bcfdeb9ef6f6343255f0e90e9b9aae0264ec08303c896ed364eea66de23aefda0270f8d780e58283495262b558e89cb014 WHIRLPOOL 6d834683baceb3d1ab7f378e75c347e7340bf89b2270e1d485a2f8c463420c00c17cb0bf4ed03a66cecb47432fecb9f10c3493c5309b02b0e9e4eb12adf6293a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlGZA8cACgkQmWq1bYTyC0NDSQD/TGqTc5/HMADsFfsk3or1fZZN
-GIqGPNZ4o7EHqTPVrk8A/jem3C8g2051/3l2qC5pJekv/q2h7xfyTiFK7csVn5Fz
-=5+yH
------END PGP SIGNATURE-----
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.35.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.35.patch
deleted file mode 100644
index a87448006e68..000000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.35.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: driver/wrapndis.c
-===================================================================
---- driver/wrapndis.c (revision 2723)
-+++ driver/wrapndis.c (working copy)
-@@ -950,20 +950,34 @@ static void set_multicast_list(struct nd
- packet_filter |= NDIS_PACKET_TYPE_PROMISCUOUS |
- NDIS_PACKET_TYPE_ALL_LOCAL;
- } else if (net_dev->flags & IFF_ALLMULTI ||
-- net_dev->mc_count > wnd->multicast_size) {
-+ netdev_mc_count(net_dev) > wnd->multicast_size) {
- packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
- TRACE2("0x%08x", packet_filter);
-- } else if (net_dev->mc_count > 0) {
-+ } else if (netdev_mc_count(net_dev) > 0) {
- int i, size;
- char *buf;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
-+ struct netdev_hw_addr *ha;
-+#else
- struct dev_mc_list *mclist;
-- size = min(wnd->multicast_size, net_dev->mc_count);
-- TRACE2("%d, %d", wnd->multicast_size, net_dev->mc_count);
-+#endif
-+ size = min(wnd->multicast_size, netdev_mc_count(net_dev));
-+ TRACE2("%d, %d", wnd->multicast_size, netdev_mc_count(net_dev));
- buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);
- if (!buf) {
- WARNING("couldn't allocate memory");
- EXIT2(return);
- }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
-+ i = 0;
-+ netdev_for_each_mc_addr(ha, net_dev) {
-+ if (i >= size)
-+ break;
-+ memcpy(buf + i * ETH_ALEN, ha->addr, ETH_ALEN);
-+ TRACE2(MACSTRSEP, MAC2STR(ha->addr));
-+ i++;
-+ }
-+#else
- mclist = net_dev->mc_list;
- for (i = 0; i < size && mclist; mclist = mclist->next) {
- if (mclist->dmi_addrlen != ETH_ALEN)
-@@ -972,6 +986,7 @@ static void set_multicast_list(struct nd
- TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr));
- i++;
- }
-+#endif
- res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i * ETH_ALEN);
- if (res == NDIS_STATUS_SUCCESS && i > 0)
- packet_filter |= NDIS_PACKET_TYPE_MULTICAST;
-Index: driver/usb.c
-===================================================================
---- driver/usb.c (revision 2723)
-+++ driver/usb.c (working copy)
-@@ -191,7 +191,7 @@ static void wrap_free_urb(struct urb *ur
- if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {
- USBTRACE("freeing DMA buffer for URB: %p %p",
- urb, urb->transfer_buffer);
-- usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev,
-+ usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev,
- urb->transfer_buffer_length,
- urb->transfer_buffer, urb->transfer_dma);
- }
-@@ -304,7 +304,7 @@ static struct urb *wrap_alloc_urb(struct
- #endif
- )) {
- urb->transfer_buffer =
-- usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,
-+ usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags,
- &urb->transfer_dma);
- if (!urb->transfer_buffer) {
- WARNING("couldn't allocate dma buf");
-Index: driver/ntoskernel.h
-===================================================================
---- driver/ntoskernel.h (revision 2723)
-+++ driver/ntoskernel.h (working copy)
-@@ -324,6 +324,12 @@ typedef u32 pm_message_t;
- kmem_cache_create(name, size, align, flags, NULL)
- #endif
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)
-+#define netdev_mc_count(dev) ((dev)->mc_count)
-+#define usb_alloc_coherent(dev, size, mem_flags, dma) (usb_buffer_alloc((dev), (size), (mem_flags), (dma)))
-+#define usb_free_coherent(dev, size, addr, dma) (usb_buffer_free((dev), (size), (addr), (dma)))
-+#endif
-+
- #include "winnt_types.h"
- #include "ndiswrapper.h"
- #include "pe_linker.h"
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch
deleted file mode 100644
index 1c32151360cd..000000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- trunk/ndiswrapper/driver/loader.c 2010/09/13 08:35:26 2725
-+++ trunk/ndiswrapper/driver/loader.c 2010/09/13 08:43:15 2726
-@@ -750,8 +750,13 @@
- }
-
- /* called with loader_mutex is down */
-+#ifdef HAVE_UNLOCKED_IOCTL
-+static long wrapper_ioctl(struct file *file,
-+ unsigned int cmd, unsigned long arg)
-+#else
- static int wrapper_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
-+#endif
- {
- struct load_driver *load_driver;
- struct load_device load_device;
-@@ -831,7 +836,12 @@
-
- static struct file_operations wrapper_fops = {
- .owner = THIS_MODULE,
-+
-+#ifdef HAVE_UNLOCKED_IOCTL
-+ .unlocked_ioctl = wrapper_ioctl,
-+#else
- .ioctl = wrapper_ioctl,
-+#endif
- .release = wrapper_ioctl_release,
- };
-
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.38.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.38.patch
deleted file mode 100644
index 6fdb1e8871bb..000000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.38.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- trunk/ndiswrapper/driver/wrapndis.c 2010/09/13 09:36:56 2728
-+++ trunk/ndiswrapper/driver/wrapndis.c 2011/02/14 17:00:00 2729
-@@ -13,16 +13,16 @@
- *
- */
-
--#include "ndis.h"
--#include "iw_ndis.h"
--#include "pnp.h"
--#include "loader.h"
--#include "wrapndis.h"
- #include <linux/inetdevice.h>
- #include <linux/ip.h>
- #include <linux/tcp.h>
- #include <linux/udp.h>
- #include <linux/in.h>
-+#include "ndis.h"
-+#include "iw_ndis.h"
-+#include "pnp.h"
-+#include "loader.h"
-+#include "wrapndis.h"
- #include "wrapper.h"
-
- /* Functions callable from the NDIS driver */
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-ldflags.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-ldflags.patch
deleted file mode 100644
index d4e78a61b93d..000000000000
--- a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/Makefile b/utils/Makefile
-index f1701a6..ca4cefc 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -12,7 +12,7 @@ DISTFILES=Makefile ndiswrapper loadndisdriver.c ndiswrapper-buginfo
- all: loadndisdriver
-
- loadndisdriver: loadndisdriver.c
-- $(CC) $(CFLAGS) -o $@ $<
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
-
- clean:
- rm -f *~ *.o loadndisdriver
diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.59-cflags.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.59-cflags.patch
new file mode 100644
index 000000000000..25359c7c30c1
--- /dev/null
+++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.59-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/utils/Makefile b/utils/Makefile
+index 0e763c6..d555dda 100644
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -6,7 +6,7 @@ HEADERS = $(DRIVER_DIR)/loader.h $(DRIVER_DIR)/ndiswrapper.h
+
+ CC = gcc
+ HOSTCC = $(CC)
+-CFLAGS = -g -Wall -I$(DRIVER_DIR)
++CFLAGS += -I$(DRIVER_DIR)
+
+ DISTFILES=Makefile ndiswrapper loadndisdriver.c ndiswrapper-buginfo
+
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild
deleted file mode 100644
index fcad83a47cbf..000000000000
--- a/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.58_rc1.ebuild,v 1.3 2013/01/19 21:21:08 angelos Exp $
-
-EAPI=4
-inherit base linux-mod toolchain-funcs
-
-MY_PV=${PV/_}
-DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
-HOMEPAGE="http://ndiswrapper.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/testing/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug usb"
-
-DEPEND="sys-apps/pciutils"
-RDEPEND="${DEPEND}
- net-wireless/wireless-tools"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=( "${FILESDIR}"/${PN}-1.56-cflags.patch )
-MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
-BUILD_TARGETS="all"
-MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
-
-pkg_pretend() {
- CONFIG_CHECK="~WEXT_PRIV"
- use usb && CONFIG_CHECK="${CONFIG_CHECK} ~USB"
- ERROR_USB="You need to enable USB support in your kernel to use usb support in ndiswrapper."
- ERROR_WEXT_PRIV="Your kernel does not support WEXT_PRIV. To enable it you need to enable a wireless driver that enables it, for example PRISM54 or IPW2200"
- linux-mod_pkg_setup
-}
-
-src_prepare() {
- base_src_prepare
-
- # Linux 3.7 fix by Philip Müller <philm@manjaro.org>
- sed -i "s|/include/linux/version.h|/include/generated/uapi/linux/version.h|g" driver/Makefile
-}
-
-src_compile() {
- local params="WRAP_WQ=1"
-
- # Enable verbose debugging information
- if use debug; then
- params="${params} DEBUG=3"
- use usb && params="${params} USB_DEBUG=1"
- fi
-
- cd utils
- emake CC=$(tc-getCC)
-
- use usb || params="${params} DISABLE_USB=1"
-
- BUILD_PARAMS="KSRC=${KV_DIR} KVERS=${KV_FULL} KBUILD='${KV_OUT_DIR}' ${params}"
- linux-mod_src_compile
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog INSTALL README
- doman ndiswrapper.8
-
- keepdir /etc/ndiswrapper
-
- linux-mod_src_install
-
- cd utils
- emake DESTDIR="${D}" install
-}
-
-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'."
- echo
-
- elog "Please look at ${HOMEPAGE}"
- elog "for the FAQ, HowTos, tips, configuration, and installation"
- elog "information."
- echo
-
- for i in $(lspci -n | egrep '(0280|0200):' | cut -d' ' -f1)
- do
- i_desc=$(lspci -nn | grep "$i" | awk -F': ' '{print $2}' | awk -F'[' '{print $1}')
- if [[ -n "${i_desc}" ]] ; then
- elog "Possible hardware: ${i_desc}"
- fi
- done
-
- echo
- 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
-}
diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild
index fa4a68b08bf9..9ae093785b4f 100644
--- a/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild
+++ b/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.57.ebuild,v 1.4 2012/06/08 11:44:49 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.59.ebuild,v 1.1 2014/03/22 11:49:03 angelos Exp $
EAPI=4
inherit base linux-mod toolchain-funcs
DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
HOMEPAGE="http://ndiswrapper.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/stable/${PV}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/stable/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="debug usb"
DEPEND="sys-apps/pciutils"
RDEPEND="${DEPEND}
net-wireless/wireless-tools"
-PATCHES=( "${FILESDIR}"/${PN}-1.56-cflags.patch )
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
BUILD_TARGETS="all"
MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")