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

Package-Manager: portage-2.1.2_rc4-r6

5 files changed, 156 insertions, 9 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/Manifest b/net-wireless/ipw3945/Manifest
index 16a7a63b8a61..33b9b9cdc7f2 100644
--- a/net-wireless/ipw3945/Manifest
+++ b/net-wireless/ipw3945/Manifest
@@ -5,6 +5,10 @@ AUX ipw3945-1.0.5-linux-2.6.19.patch 356 RMD160 322ba91a6096b09dd5a5dfb2f1dfe07c
 MD5 24592a5a90c5230c46b352538faf7149 files/ipw3945-1.0.5-linux-2.6.19.patch 356
 RMD160 322ba91a6096b09dd5a5dfb2f1dfe07c1b3ea08a files/ipw3945-1.0.5-linux-2.6.19.patch 356
 SHA256 6d931054664ecf1545fd6f94e28e3549c1178bdbe247e0579e8f93334f9c9cd4 files/ipw3945-1.0.5-linux-2.6.19.patch 356
+AUX ipw3945-1.1.3-Makefile.patch 2849 RMD160 c15b88706262569d6108bacd61c427722c964499 SHA1 a6078be813c138cffb780e634cf783777c141d4b SHA256 5c5099752e2890b32cea08705690d867ba5038132da130e16037c06ffafdee39
+MD5 e96ac91edc5599457c3720483e9736a3 files/ipw3945-1.1.3-Makefile.patch 2849
+RMD160 c15b88706262569d6108bacd61c427722c964499 files/ipw3945-1.1.3-Makefile.patch 2849
+SHA256 5c5099752e2890b32cea08705690d867ba5038132da130e16037c06ffafdee39 files/ipw3945-1.1.3-Makefile.patch 2849
 DIST ipw3945-1.0.5.tgz 174149 RMD160 485f8dbe3404d5e7f32d6f3a6f955de322b0d7c9 SHA1 8dc4a59a4228aaf69e605ed3ad48cabc84b41a31 SHA256 c2acb3403d623b43e432e09c34739c9265cadc586effc1dac2444ae701c4aa45
 DIST ipw3945-1.1.0.tgz 196361 RMD160 6d4b8c12c253b4d00b376911e73ca48d8ab6da35 SHA1 0d1e6acb05003d2f8d40f64114236982f980a170 SHA256 be62bb249527dbe5a4031eec9cdf15e09fe1dc0fdd1b5dc374e85bc5229c1ff1
 DIST ipw3945-1.1.1.tgz 196455 RMD160 0d2fdbc397f35e798ac2cf5f81899c42153c5ab4 SHA1 f86affe2450149de9a80948e241fa26479b8b85d SHA256 37876722e88feb30b305f9d298597d5ea6c5d1976c05851fd1d06ff0a041cdab
@@ -30,14 +34,18 @@ EBUILD ipw3945-1.1.2.ebuild 2545 RMD160 add57a060476a8793529d9643a065aad4e3af6a7
 MD5 6d37ba0362176fef0ca4d2db1c8087e8 ipw3945-1.1.2.ebuild 2545
 RMD160 add57a060476a8793529d9643a065aad4e3af6a7 ipw3945-1.1.2.ebuild 2545
 SHA256 1f6e58969b6720b56489bfa6e09b1b8e0802f0c57c365d8cf157dbd7925272df ipw3945-1.1.2.ebuild 2545
+EBUILD ipw3945-1.1.3-r1.ebuild 1708 RMD160 e15840acdbadd827431c7a9a000cbdba42336624 SHA1 0fe4570fe08f3ef7b8877d4a8ef22ebbf6ae4c3b SHA256 bd49165e32440aae2c7e6a9f4367560915899a7ab005890a34adff0e7bc94edf
+MD5 692cdc48b8526dc885b66108e2ddb531 ipw3945-1.1.3-r1.ebuild 1708
+RMD160 e15840acdbadd827431c7a9a000cbdba42336624 ipw3945-1.1.3-r1.ebuild 1708
+SHA256 bd49165e32440aae2c7e6a9f4367560915899a7ab005890a34adff0e7bc94edf ipw3945-1.1.3-r1.ebuild 1708
 EBUILD ipw3945-1.1.3.ebuild 2548 RMD160 745b2b7727878bf83820eee2ec69be96139e87e1 SHA1 ccf19e1328285da77d5c6628e56333d298b8480d SHA256 8f35b82df0f21258926384bd203108efa3fe10acc89421db46a5ece781d7cd29
 MD5 ec9925d3e7776d459df8dab7482c287c ipw3945-1.1.3.ebuild 2548
 RMD160 745b2b7727878bf83820eee2ec69be96139e87e1 ipw3945-1.1.3.ebuild 2548
 SHA256 8f35b82df0f21258926384bd203108efa3fe10acc89421db46a5ece781d7cd29 ipw3945-1.1.3.ebuild 2548
-MISC ChangeLog 2967 RMD160 04508ba5a559d1e92b8e21b338843ad88fa959b2 SHA1 3cf17f2cae5dbf7be5e6c5d7aefcb965e75a404b SHA256 63d8c9cacf3f932d2c9df060ed97681cd3c5054541f3fba930e0c2e7fb32b785
-MD5 49af38f96cabb8d3b987a3ccc22874a0 ChangeLog 2967
-RMD160 04508ba5a559d1e92b8e21b338843ad88fa959b2 ChangeLog 2967
-SHA256 63d8c9cacf3f932d2c9df060ed97681cd3c5054541f3fba930e0c2e7fb32b785 ChangeLog 2967
+MISC ChangeLog 3185 RMD160 e6bdd72ea05548f61b69056253342ac549abe2b4 SHA1 69a66ff286ed3c29ebe9a90f3de089ff041324f0 SHA256 84ecddc3ee417b4351905791af54eb62e2dba9ca1e2844fe43793192e8654c21
+MD5 31bd778717d5c9c7597b62ff0e24314d ChangeLog 3185
+RMD160 e6bdd72ea05548f61b69056253342ac549abe2b4 ChangeLog 3185
+SHA256 84ecddc3ee417b4351905791af54eb62e2dba9ca1e2844fe43793192e8654c21 ChangeLog 3185
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -60,10 +68,13 @@ SHA256 fec1be42ddc8cb161469402a4ac4210fd0b93af3ae49913c464cd5243d25543d files/di
 MD5 658ccdc801deb2065c291a72f67899e9 files/digest-ipw3945-1.1.3 232
 RMD160 ed0b267a08dba0590a77a890f1657e73e7397f15 files/digest-ipw3945-1.1.3 232
 SHA256 4cf79d885fdb98243501092e5b00e0ba1d6223130190c0ee2ccb5bb163ac41a9 files/digest-ipw3945-1.1.3 232
+MD5 658ccdc801deb2065c291a72f67899e9 files/digest-ipw3945-1.1.3-r1 232
+RMD160 ed0b267a08dba0590a77a890f1657e73e7397f15 files/digest-ipw3945-1.1.3-r1 232
+SHA256 4cf79d885fdb98243501092e5b00e0ba1d6223130190c0ee2ccb5bb163ac41a9 files/digest-ipw3945-1.1.3-r1 232
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFlER8ppoStNGKGywRAiJIAJ470SCeCCJA3b4qTi1WHjo3QeTUMgCeL79p
-sVj9YhyrZ1l8dY++SduOt0c=
-=mtqL
+iD8DBQFFoVSQyuNVb5qfaOYRAirmAJ96mYJlw2z8UGMUrUtYnSfIcR5owwCfcTlc
+TB1AFbIWIOMonLSyo5ZyPYc=
+=7x0P
 -----END PGP SIGNATURE-----
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
+}