Add support for 2.6.20, and essid name patch.

(Portage version: 2.1.2_rc4-r6)

4 files changed, 97 insertions, 3 deletions

diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog
index 5977e51e5bc0..1598e08b417a 100644
--- a/net-wireless/ipw3945/ChangeLog
+++ b/net-wireless/ipw3945/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw3945
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.18 2007/01/08 20:33:28 robbat2 Exp $
+
+*ipw3945-1.1.3-r2 (08 Jan 2007)
+
+  08 Jan 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +ipw3945-1.1.3-r2.ebuild:
+  Add support for 2.6.20, and essid name patch.
 
 *ipw3945-1.1.3-r1 (07 Jan 2007)
 
diff --git a/net-wireless/ipw3945/files/digest-ipw3945-1.1.3-r2 b/net-wireless/ipw3945/files/digest-ipw3945-1.1.3-r2
new file mode 100644
index 000000000000..ca56c7f26bc5
--- /dev/null
+++ b/net-wireless/ipw3945/files/digest-ipw3945-1.1.3-r2
@@ -0,0 +1,15 @@
+MD5 ca3b8daae7db33bd2c676658f303159c ipw3945-1.1.3-2.6.20-1.patch 17518
+RMD160 34228593281ac9501e77878368072b4fa501f89f ipw3945-1.1.3-2.6.20-1.patch 17518
+SHA256 69dc7a59d747344aa903f88ac01b74da1fc081593b6c4f5756a6cf59ed4ea9b9 ipw3945-1.1.3-2.6.20-1.patch 17518
+MD5 97cf6586f088b6786eb0f5130d1cc917 ipw3945-1.1.3-2.6.20-2.patch 15705
+RMD160 2eaabe0f39767af9a5acb36c6eb65f0995e50051 ipw3945-1.1.3-2.6.20-2.patch 15705
+SHA256 fc11798485227c3826156737341622563883f4fc1e69b8274a3acb11ac40885b ipw3945-1.1.3-2.6.20-2.patch 15705
+MD5 4c730dfd0510877f6e39a89d7ccdd8e4 ipw3945-1.1.3-2.6.20-register.patch 1265
+RMD160 69bdf87cb29c8c0d80e27a46345941ef14bc3b37 ipw3945-1.1.3-2.6.20-register.patch 1265
+SHA256 fa94249aea3bfbb176efff3276b85bc97e63a39ddc84fbe705bfda137d9e4583 ipw3945-1.1.3-2.6.20-register.patch 1265
+MD5 2cca7c91ea4c89e72e2b8be96973a7f7 ipw3945-1.1.3.tgz 197586
+RMD160 530cbd51ad08f110b936791dbc6ef8dc24ba56b6 ipw3945-1.1.3.tgz 197586
+SHA256 383bd429e8f4b2bf09c5a5078bf46c5912e02c3ab5e2856ee51e7fa1f62cc251 ipw3945-1.1.3.tgz 197586
+MD5 d1704c0a03e5cb5ff43afd3964c3fec4 ipw3945-1.1.4.essid.patch 880
+RMD160 6379a8aa4d9c30e048c6a0606c32b8b5f9d0f2d2 ipw3945-1.1.4.essid.patch 880
+SHA256 8c12cc8373b9336c4837fc9be2f4227856a904c1526e6be058c5316e3c834709 ipw3945-1.1.4.essid.patch 880
diff --git a/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild b/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild
index 8f02e658b288..63a2ab33d66b 100644
--- a/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild
+++ b/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.1.3-r1.ebuild,v 1.2 2007/01/08 20:33:28 robbat2 Exp $
 
 inherit linux-mod eutils
 
@@ -19,7 +19,6 @@ 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}"
 
diff --git a/net-wireless/ipw3945/ipw3945-1.1.3-r2.ebuild b/net-wireless/ipw3945/ipw3945-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..824c0ddf2ea6
--- /dev/null
+++ b/net-wireless/ipw3945/ipw3945-1.1.3-r2.ebuild
@@ -0,0 +1,74 @@
+# 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-r2.ebuild,v 1.1 2007/01/08 20:33:28 robbat2 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_PATCHBASE="http://${PN}.sourceforge.net/patches/${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-pre}.tgz
+	${SRC_URI_PATCHBASE}-1.1.3-2.6.20-register.patch
+	${SRC_URI_PATCHBASE}-1.1.4.essid.patch
+	${SRC_URI_PATCHBASE}-1.1.3-2.6.20-2.patch
+	${SRC_URI_PATCHBASE}-1.1.3-2.6.20-1.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug"
+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 ${P/_pre/-pre}.tgz
+
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/${P}-Makefile.patch
+	EPATCH_OPTS="-d ${S} -p1" epatch ${DISTDIR}/${PN}-1.1.4.essid.patch
+	if kernel_is ge 2 6 20; then
+		EPATCH_OPTS="-d ${S} -p1" epatch ${DISTDIR}/${PN}-1.1.3-2.6.20-register.patch
+		EPATCH_OPTS="-d ${S} -p1" epatch ${DISTDIR}/${PN}-1.1.3-2.6.20-1.patch
+		EPATCH_OPTS="-d ${S} -p1" epatch ${DISTDIR}/${PN}-1.1.3-2.6.20-2.patch
+	fi
+
+	cd "${S}"
+	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
+}