Add support for 2.6.20, and essid name patch.

Package-Manager: portage-2.1.2_rc4-r6

5 files changed, 116 insertions, 21 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/Manifest b/net-wireless/ipw3945/Manifest
index 33b9b9cdc7f2..de5a5da89ad1 100644
--- a/net-wireless/ipw3945/Manifest
+++ b/net-wireless/ipw3945/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ipw3945-1.0.5-linux-2.6.19.patch 356 RMD160 322ba91a6096b09dd5a5dfb2f1dfe07c1b3ea08a SHA1 06d82253361c0ab570788443e31e87f234d99730 SHA256 6d931054664ecf1545fd6f94e28e3549c1178bdbe247e0579e8f93334f9c9cd4
 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
@@ -13,7 +10,11 @@ DIST ipw3945-1.0.5.tgz 174149 RMD160 485f8dbe3404d5e7f32d6f3a6f955de322b0d7c9 SH
 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
 DIST ipw3945-1.1.2.tgz 196846 RMD160 c1e9a968e2378817b8e406d3be5c1ea4bd3b4bed SHA1 aefa31aca38b62d7497db7559336ad65919f5146 SHA256 5bc6eaaea215c9c3f1e025fb1320a7eea102301cd6b5a4f831ad7a8c5a9927d7
+DIST ipw3945-1.1.3-2.6.20-1.patch 17518 RMD160 34228593281ac9501e77878368072b4fa501f89f SHA1 2f961c86e8f7975d1341efce59a6baa7d8e816b3 SHA256 69dc7a59d747344aa903f88ac01b74da1fc081593b6c4f5756a6cf59ed4ea9b9
+DIST ipw3945-1.1.3-2.6.20-2.patch 15705 RMD160 2eaabe0f39767af9a5acb36c6eb65f0995e50051 SHA1 ba7f4a8e3ff1452d37c1c367ad818690b00c4591 SHA256 fc11798485227c3826156737341622563883f4fc1e69b8274a3acb11ac40885b
+DIST ipw3945-1.1.3-2.6.20-register.patch 1265 RMD160 69bdf87cb29c8c0d80e27a46345941ef14bc3b37 SHA1 79266297e85f6d6f30f4642954580535b331de87 SHA256 fa94249aea3bfbb176efff3276b85bc97e63a39ddc84fbe705bfda137d9e4583
 DIST ipw3945-1.1.3.tgz 197586 RMD160 530cbd51ad08f110b936791dbc6ef8dc24ba56b6 SHA1 eb5a65eaf0bfb53ef19f91d1d7bd3a1da2326a14 SHA256 383bd429e8f4b2bf09c5a5078bf46c5912e02c3ab5e2856ee51e7fa1f62cc251
+DIST ipw3945-1.1.4.essid.patch 880 RMD160 6379a8aa4d9c30e048c6a0606c32b8b5f9d0f2d2 SHA1 fdea4f3055be6b16ba3a12ddaf4d3e38661925f8 SHA256 8c12cc8373b9336c4837fc9be2f4227856a904c1526e6be058c5316e3c834709
 EBUILD ipw3945-1.0.5.ebuild 2645 RMD160 5a5bb89186156d25d03bd394e2d9fdb3f1103de1 SHA1 a8412147786e7df4d70fc0e3c8cba525dd011702 SHA256 31628d32903a29f5fcae03b9333e8285bd6abf9959b791e5cb29a0aa4cf7c9b1
 MD5 27382806a3fb85e5eb1eb087f428a56c ipw3945-1.0.5.ebuild 2645
 RMD160 5a5bb89186156d25d03bd394e2d9fdb3f1103de1 ipw3945-1.0.5.ebuild 2645
@@ -34,18 +35,22 @@ 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-r1.ebuild 1669 RMD160 a69baf624116af1d736dd59429275495ad4df360 SHA1 756475dcbfcd5b3e609e5e3098f82a2cf5432558 SHA256 7f9664399e4cf48ef0d45fd0db8ce4a76359062a5c6a8169fcb4d995c535c876
+MD5 f97e54453f19f26a8797a9e05e93ff06 ipw3945-1.1.3-r1.ebuild 1669
+RMD160 a69baf624116af1d736dd59429275495ad4df360 ipw3945-1.1.3-r1.ebuild 1669
+SHA256 7f9664399e4cf48ef0d45fd0db8ce4a76359062a5c6a8169fcb4d995c535c876 ipw3945-1.1.3-r1.ebuild 1669
+EBUILD ipw3945-1.1.3-r2.ebuild 2275 RMD160 5cf9dc8d82b4ef49ae4550f915d1547d285e48c3 SHA1 abfb49f75b3bd781a9145403ea42cdb5dc3d8a91 SHA256 078628cf13569b6fa29be1aed2c2c11e020cc0f3b6fdd38c2c72dd36b789b78c
+MD5 6875934ef65019cc5efb1b6777d50efe ipw3945-1.1.3-r2.ebuild 2275
+RMD160 5cf9dc8d82b4ef49ae4550f915d1547d285e48c3 ipw3945-1.1.3-r2.ebuild 2275
+SHA256 078628cf13569b6fa29be1aed2c2c11e020cc0f3b6fdd38c2c72dd36b789b78c ipw3945-1.1.3-r2.ebuild 2275
 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 3185 RMD160 e6bdd72ea05548f61b69056253342ac549abe2b4 SHA1 69a66ff286ed3c29ebe9a90f3de089ff041324f0 SHA256 84ecddc3ee417b4351905791af54eb62e2dba9ca1e2844fe43793192e8654c21
-MD5 31bd778717d5c9c7597b62ff0e24314d ChangeLog 3185
-RMD160 e6bdd72ea05548f61b69056253342ac549abe2b4 ChangeLog 3185
-SHA256 84ecddc3ee417b4351905791af54eb62e2dba9ca1e2844fe43793192e8654c21 ChangeLog 3185
+MISC ChangeLog 3349 RMD160 8c5928ebcbc92181437eee7d50c77abb10585cc0 SHA1 6ef442a1e1bd8bfc0a8ba0f5e116fc4bb04eb21d SHA256 609704bb7287133a9cf944f650e21093a26552e0ae10d9024abf67e4d796268a
+MD5 3ec6207c6dfd4f22c4dab4c725993c02 ChangeLog 3349
+RMD160 8c5928ebcbc92181437eee7d50c77abb10585cc0 ChangeLog 3349
+SHA256 609704bb7287133a9cf944f650e21093a26552e0ae10d9024abf67e4d796268a ChangeLog 3349
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -71,10 +76,6 @@ SHA256 4cf79d885fdb98243501092e5b00e0ba1d6223130190c0ee2ccb5bb163ac41a9 files/di
 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)
-
-iD8DBQFFoVSQyuNVb5qfaOYRAirmAJ96mYJlw2z8UGMUrUtYnSfIcR5owwCfcTlc
-TB1AFbIWIOMonLSyo5ZyPYc=
-=7x0P
------END PGP SIGNATURE-----
+MD5 5bab24aeecc2f9037f20bfa011da592d files/digest-ipw3945-1.1.3-r2 1283
+RMD160 7c069b029372ffb4d9c9e8bc3f0d0c1e504a041c files/digest-ipw3945-1.1.3-r2 1283
+SHA256 cdd8d4e8bd484e4b377b2ce97de7c64745d3a0fa9aa6a1432c62b17aba44191d files/digest-ipw3945-1.1.3-r2 1283
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
+}