Adding an updated ebuild, now relying on the in-kernel ieee80211.

(Portage version: 2.1.2_rc4-r6)

4 files changed, 138 insertions, 2 deletions

diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog
index 7ed7c0793e9b..5977e51e5bc0 100644
--- a/net-wireless/ipw3945/ChangeLog
+++ b/net-wireless/ipw3945/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw3945
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.16 2006/12/28 22:25:56 peper Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.17 2007/01/07 20:49:03 phreak Exp $
+
+*ipw3945-1.1.3-r1 (07 Jan 2007)
+
+  07 Jan 2007; Christian Heim <phreak@gentoo.org>
+  +files/ipw3945-1.1.3-Makefile.patch, +ipw3945-1.1.3-r1.ebuild:
+  Adding an updated ebuild, now relying on the in-kernel ieee80211.
 
   28 Dec 2006; Piotr Jaroszyński <peper@gentoo.org> ipw3945-1.1.3.ebuild:
   Add ~amd64 wrt bug #148674.
diff --git a/net-wireless/ipw3945/files/digest-ipw3945-1.1.3-r1 b/net-wireless/ipw3945/files/digest-ipw3945-1.1.3-r1
new file mode 100644
index 000000000000..f3b31a211aa3
--- /dev/null
+++ b/net-wireless/ipw3945/files/digest-ipw3945-1.1.3-r1
@@ -0,0 +1,3 @@
+MD5 2cca7c91ea4c89e72e2b8be96973a7f7 ipw3945-1.1.3.tgz 197586
+RMD160 530cbd51ad08f110b936791dbc6ef8dc24ba56b6 ipw3945-1.1.3.tgz 197586
+SHA256 383bd429e8f4b2bf09c5a5078bf46c5912e02c3ab5e2856ee51e7fa1f62cc251 ipw3945-1.1.3.tgz 197586
diff --git a/net-wireless/ipw3945/files/ipw3945-1.1.3-Makefile.patch b/net-wireless/ipw3945/files/ipw3945-1.1.3-Makefile.patch
new file mode 100644
index 000000000000..95729905ba06
--- /dev/null
+++ b/net-wireless/ipw3945/files/ipw3945-1.1.3-Makefile.patch
@@ -0,0 +1,63 @@
+Index: ipw3945-1.1.3/Makefile
+===================================================================
+--- ipw3945-1.1.3.orig/Makefile
++++ ipw3945-1.1.3/Makefile
+@@ -26,20 +26,20 @@ CONFIG_IPW3945_DEBUG=y
+ # NOTE:  If you have problems compiling due to IW_MODE_MONITOR not being
+ #        defined then you need to update the wireless extension version
+ #	 installed in your kernel, or comment this line out.
+-# CONFIG_IPW3945_MONITOR=y
++CONFIG_IPW3945_MONITOR=y
+ 
+ # If you are interested in using radiotap headers in monitor mode,
+ # simply uncomment:
+ #
+ # NOTE:  To use RADIOTAP you must also enable MONITOR above.
+-# CONFIG_IEEE80211_RADIOTAP=y
++CONFIG_IEEE80211_RADIOTAP=y
+ 
+ # The above monitor mode provides standard monitor mode.  The following
+ # will create a new interface (named raw%d) which will be sent all
+ # 802.11 frames received on the interface
+ #
+ # NOTE:  To use PROMISCUOUS you must also enable MONITOR above.
+-# CONFIG_IPW3945_PROMISCUOUS=y
++CONFIG_IPW3945_PROMISCUOUS=y
+ 
+ # The following, if enabled, will add a sysfs entry 'rx' that raw
+ # 802.11 radiotap formatted packets can be written to.  Those packets
+@@ -172,34 +172,6 @@ utils:
+ 	@[ ! -d util ] || make -C util IEEE80211_PATH=$(IEEE80211_PATH)
+ 
+ check_inc:
+-	@( [ "$(IEEE80211_DUPLICATE)" ] && echo -e \
+-"\n WARNING: Your kernel contains ieee80211 symbol definitions and you\n"\
+-"are not using the kernel's default ieee80211 subsystem.  (Perhaps you\n"\
+-"used the out-of-tree ieee80211 subsystem's 'make install' or have\n"\
+-"provided a path to the ieee80211 subsystem via IEEE80211_INC.)\n\n"\
+-"If you wish to use the out-of-tree ieee80211 subsystem then it is\n"\
+-"recommended to use that projects' \"make patch_kernel\" facility\n"\
+-"and rebuild your kernel to update the Module symbol version information.\n"\
+-"\n"\
+-"Failure to do this may result in build warnings and unexpected\n"\
+-"behavior when running modules which rely on the ieee80211 subsystem.\n\n"\ || \
+-	exit 0)
+-
+-	@( [ "$(IEEE80211_DUPLICATE)" ] && \
+-	   [ ! "$(IEEE80211_IGNORE_DUPLICATE)" ] && echo -e \
+-" Aborting the build.  You can force the build to continue by adding:\n\n"\
+-"\tIEEE80211_IGNORE_DUPLICATE=y\n\n"\
+-"to your make command line.\n\n" && exit 1 || exit 0)
+-
+-	@( [ ! "$(IEEE80211_API)" ] && echo -e \
+-"\n ERROR: A compatible subsystem was not found in the following path[s]:\n\n"\
+-"\t$(IEEE80211_RES)\n\n"\
+-"You need to install the ieee80211 subsystem from http://ieee80211.sf.net\n"\
+-"and point this build to the location where you installed those sources, eg.:\n\n"\
+-"\t% make IEEE80211_INC=/usr/src/ieee80211/\n\n"\
+-"or use the 'make patch_kernel' within the ieee80211 subsystem to patch your\n"\
+-"kernel sources.\n" && exit 1 || exit 0)
+-
+ 	@echo -e \
+ " Using ieee80211 subsystem version API v$(IEEE80211_API) from:\n\n" \
+ "\tBase: $(IEEE80211_BASE)\n" \
diff --git a/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild b/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..8f02e658b288
--- /dev/null
+++ b/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild,v 1.1 2007/01/07 20:49:03 phreak Exp $
+
+inherit linux-mod eutils
+
+S=${WORKDIR}/${P/_pre/-pre}
+
+IEEE80211_VERSION="1.2.15"
+UCODE_VERSION="1.13"
+DAEMON_VERSION="1.7.22"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 3945ABG miniPCI express adapter"
+HOMEPAGE="http://ipw3945.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-pre}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug"
+DEPEND=">=virtual/linux-sources-2.6.19"
+RDEPEND=">=net-wireless/ipw3945-ucode-${UCODE_VERSION}
+		>=net-wireless/ipw3945d-${DAEMON_VERSION}"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="ipw3945(net/wireless:)"
+MODULESD_IPW3945_DOCS="README.ipw3945"
+
+CONFIG_CHECK="NET_RADIO FW_LOADER IEEE80211 IEEE80211_CRYPT_CCMP IEEE80211_CRYPT_TKIP"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+ERROR_IEEE80211="${P} requires support for Generic IEEE 802.11 Networking Stack (CONFIG_IEEE80211)."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+
+	if use debug ; then
+		sed -i -e "s:^\(CONFIG_IPW3945_DEBUG\)=.*:\1=y:" "${S}"/Makefile || die
+	fi
+}
+
+src_compile() {
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc CHANGES ISSUES
+}