Version bump, remove old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )

8 files changed, 29 insertions, 279 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/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")