Adding some information about the switch from net-wireless/ieee80211 to the in-kernel ieee80211 subsystem. Thanks to Jakub for the initial patch. Also cleaning up the ebuild itself a bit (removing obsoleted patches, sanatizing epatch.

Package-Manager: portage-2.1.2-r9

4 files changed, 51 insertions, 51 deletions

diff --git a/net-wireless/ipw3945/ChangeLog b/net-wireless/ipw3945/ChangeLog
index 63c4ee905c2f..62561796a727 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.22 2007/02/02 20:50:36 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ChangeLog,v 1.23 2007/02/09 20:57:21 phreak Exp $
+
+  09 Feb 2007; Christian Heim <phreak@gentoo.org> ipw3945-1.2.0.ebuild:
+  Adding some information about the switch from net-wireless/ieee80211 to the
+  in-kernel ieee80211 subsystem. Thanks to Jakub for the initial patch. Also
+  cleaning up the ebuild itself a bit (removing obsoleted patches, sanatizing
+  epatch.
 
   02 Feb 2007; Christian Heim <phreak@gentoo.org>
   -files/ipw3945-1.1.3-Makefile.patch, -ipw3945-1.1.0.ebuild,
diff --git a/net-wireless/ipw3945/Manifest b/net-wireless/ipw3945/Manifest
index 59344c558414..93cd15cdf609 100644
--- a/net-wireless/ipw3945/Manifest
+++ b/net-wireless/ipw3945/Manifest
@@ -10,23 +10,19 @@ MD5 f4d59dd3b6bb84e99d962af4319f2515 files/ipw3945-1.2.0-Makefile.patch 2849
 RMD160 0e5557d6d33f28815e98ac2801048d227f716b07 files/ipw3945-1.2.0-Makefile.patch 2849
 SHA256 dec634d0538d12a3109f99be0481d367d423ba79a7a59a7da3c18b020dbe0009 files/ipw3945-1.2.0-Makefile.patch 2849
 DIST ipw3945-1.0.5.tgz 174149 RMD160 485f8dbe3404d5e7f32d6f3a6f955de322b0d7c9 SHA1 8dc4a59a4228aaf69e605ed3ad48cabc84b41a31 SHA256 c2acb3403d623b43e432e09c34739c9265cadc586effc1dac2444ae701c4aa45
-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.4.essid.patch 880 RMD160 6379a8aa4d9c30e048c6a0606c32b8b5f9d0f2d2 SHA1 fdea4f3055be6b16ba3a12ddaf4d3e38661925f8 SHA256 8c12cc8373b9336c4837fc9be2f4227856a904c1526e6be058c5316e3c834709
 DIST ipw3945-1.2.0.tgz 200122 RMD160 333c94962e302c8dd50664f2d2d70f2c7878c84e SHA1 89d01b2cd86b3050115d230526d1eaefb6d9be5f SHA256 c581a2b9537e2b70c615ca12e6b0eff8439ea792d10e18ecaa4e8486bf20e545
 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
 SHA256 31628d32903a29f5fcae03b9333e8285bd6abf9959b791e5cb29a0aa4cf7c9b1 ipw3945-1.0.5.ebuild 2645
-EBUILD ipw3945-1.2.0.ebuild 2050 RMD160 88146d85bc62d5fcd34dcfedd535512a368fd0b8 SHA1 2062468ec863d188ac6eafee48863af670bf270a SHA256 a95c4198b06533368e8bffa1157ce379bb877b691ec177258f86dc6ba1fed8f4
-MD5 ff6a38c6cbd6684ea30a40a455545d44 ipw3945-1.2.0.ebuild 2050
-RMD160 88146d85bc62d5fcd34dcfedd535512a368fd0b8 ipw3945-1.2.0.ebuild 2050
-SHA256 a95c4198b06533368e8bffa1157ce379bb877b691ec177258f86dc6ba1fed8f4 ipw3945-1.2.0.ebuild 2050
-MISC ChangeLog 4154 RMD160 17059973489ea2b78e2086ec3e2d2f46eb0de235 SHA1 2e19fbc6015c713d880b5dc3cc1ea0aae4ba9f08 SHA256 8d7eff992f18048cb13c19a17f1f9a22af84387bb66cd53e4ae212fb23c92d80
-MD5 9c04c998441eee6183465e7295490193 ChangeLog 4154
-RMD160 17059973489ea2b78e2086ec3e2d2f46eb0de235 ChangeLog 4154
-SHA256 8d7eff992f18048cb13c19a17f1f9a22af84387bb66cd53e4ae212fb23c92d80 ChangeLog 4154
+EBUILD ipw3945-1.2.0.ebuild 2553 RMD160 7668123c30022ed80172a337efbab42e72e53027 SHA1 cd8626a230f8ec26f8d36454f5b65de6282fd5d6 SHA256 30503b7d4b8c1cbecbf4c8a6466a0c431d80945748695d5a5c2a792b7b9c2d99
+MD5 68c41551e59c2571be8f02c657363487 ipw3945-1.2.0.ebuild 2553
+RMD160 7668123c30022ed80172a337efbab42e72e53027 ipw3945-1.2.0.ebuild 2553
+SHA256 30503b7d4b8c1cbecbf4c8a6466a0c431d80945748695d5a5c2a792b7b9c2d99 ipw3945-1.2.0.ebuild 2553
+MISC ChangeLog 4470 RMD160 230b4ca08fd6bb2a04be1a86587d9f85c4cc7207 SHA1 d41955314150e642fd63236110f511c649f488f5 SHA256 08981477eade01e00e234e4a27e063b1b44a0888d088e860e8eb035bc5369713
+MD5 b71158f1e867275823db4151d7fa8ad2 ChangeLog 4470
+RMD160 230b4ca08fd6bb2a04be1a86587d9f85c4cc7207 ChangeLog 4470
+SHA256 08981477eade01e00e234e4a27e063b1b44a0888d088e860e8eb035bc5369713 ChangeLog 4470
 MISC metadata.xml 350 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 SHA1 7d738b5835510288a15729917f3cc272535ec550 SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c
 MD5 792d2ecc8cee12c92c45b9878fdb2192 metadata.xml 350
 RMD160 5211e204927a69b9a6db516ada2ecb6f999b3733 metadata.xml 350
@@ -34,13 +30,13 @@ SHA256 4c12367eb2d4a151bfdfe4c2809f164ae6092fd2448321a800cd1a3a063c085c metadata
 MD5 9c3e87c6cfc5bac3743580bb9664e449 files/digest-ipw3945-1.0.5 232
 RMD160 b49115a3d9bb90e56b8a226244f1f94dad6bea86 files/digest-ipw3945-1.0.5 232
 SHA256 f77e97526fe819077d5d0d4167b9f46fc34001d3decf81c996bbdbab8eca1e7c files/digest-ipw3945-1.0.5 232
-MD5 78a214737101a92d895a1bbc2ea1cccf files/digest-ipw3945-1.2.0 1283
-RMD160 f4334585650b80cb6940e49158af95ac3ced6a07 files/digest-ipw3945-1.2.0 1283
-SHA256 ada0ca6b2183eab6a353102fee0430144506d70798842c682800fc381fb8824a files/digest-ipw3945-1.2.0 1283
+MD5 3d635161dc7cc156713590f4c44518fd files/digest-ipw3945-1.2.0 232
+RMD160 5860198886504b2bab43af485d6544908756d8a3 files/digest-ipw3945-1.2.0 232
+SHA256 a5c9a4c72cae5cfc115441ea870fc4e141dd913970d7fd7cfb362353c85814e6 files/digest-ipw3945-1.2.0 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFw6QbyuNVb5qfaOYRAv4lAJ4ocDQGpyvHtib8JR5uASaerzTGRwCeKod2
-uMJQjO/EhRQvsQx3ehOuIBw=
-=K7ST
+iD8DBQFFzOA5yuNVb5qfaOYRAjnfAJwJmDOPiA4q+KdOMgyY68kVHZ3g2wCgylZV
+P57LWWbt/sAD+bVqtsX5nWA=
+=6Or5
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/ipw3945/files/digest-ipw3945-1.2.0 b/net-wireless/ipw3945/files/digest-ipw3945-1.2.0
index 1f41c37bd6eb..2e7add7990b2 100644
--- a/net-wireless/ipw3945/files/digest-ipw3945-1.2.0
+++ b/net-wireless/ipw3945/files/digest-ipw3945-1.2.0
@@ -1,15 +1,3 @@
-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 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
 MD5 fd4cc3b52b8e1d4d1e303d30c9dcd31b ipw3945-1.2.0.tgz 200122
 RMD160 333c94962e302c8dd50664f2d2d70f2c7878c84e ipw3945-1.2.0.tgz 200122
 SHA256 c581a2b9537e2b70c615ca12e6b0eff8439ea792d10e18ecaa4e8486bf20e545 ipw3945-1.2.0.tgz 200122
diff --git a/net-wireless/ipw3945/ipw3945-1.2.0.ebuild b/net-wireless/ipw3945/ipw3945-1.2.0.ebuild
index 97f7b818c34e..b3e5f6aa3021 100644
--- a/net-wireless/ipw3945/ipw3945-1.2.0.ebuild
+++ b/net-wireless/ipw3945/ipw3945-1.2.0.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.2.0.ebuild,v 1.2 2007/02/02 20:27:34 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw3945/ipw3945-1.2.0.ebuild,v 1.3 2007/02/09 20:57:21 phreak Exp $
 
 inherit linux-mod eutils
 
@@ -11,12 +11,7 @@ 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"
+SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-pre}.tgz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
@@ -24,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="debug"
 RDEPEND=">=net-wireless/ipw3945-ucode-${UCODE_VERSION}
-		>=net-wireless/ipw3945d-${DAEMON_VERSION}"
+	>=net-wireless/ipw3945d-${DAEMON_VERSION}"
 
 BUILD_TARGETS="all"
 MODULE_NAMES="ipw3945(net/wireless:)"
@@ -36,36 +31,51 @@ ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADE
 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
+
 	if kernel_is lt 2 6 18; then
 		die "${P} needs a kernel >=2.6.18! Please set your \
-			KERNEL_DIR or /usr/src/linux suitably"
+		         KERNEL_DIR or /usr/src/linux suitably"
 	fi
 
+	# users don't read changelogs and wonder why the kernel check fails
+	# (1) check if the kernel dir (/usr/src/linux) is missing ieee80211
+
+	if [[ -f ${KV_DIR}/include/net/ieee80211.h ]] && \
+		[[ -f ${KV_OUT_DIR}/include/config/ieee80211.h ]] && \
+		egrep -q "^#(un)?def.*(CONFIG_IEEE80211.*)" ${KV_OUT_DIR}/include/linux/autoconf.h; then
+		return 0
+	else
+		echo
+		ewarn "${CATEGORY}/${PF} does NOT use net-wireless/ieee80211 any more."
+		ewarn "We are now relying on the in-kernel ieee80211 instead."
+		echo
+		eerror "Please remove net-wireless/ieee80211 using emerge, and remerge"
+		eerror "your current kernel (${KV_FULL}), as it has been altered"
+		eerror "by net-wireless/ieee80211."
+		die "Incompatible ieee80211 subsystem detected in ${KV_FULL}"
+	fi
+
+	linux-mod_pkg_setup
+
 	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
-
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+
 	if use debug ; then
-		sed -i -e "s:^\(CONFIG_IPW3945_DEBUG\)=.*:\1=y:" "${S}"/Makefile || die
+		sed -i -e "s:^\(CONFIG_IPW3945_DEBUG\)=.*:\1=y:" "${S}"/Makefile || \
+			die "Failed to enable debugging support!"
 	fi
 }
 
-src_compile() {
-	linux-mod_src_compile
-}
-
 src_install() {
 	linux-mod_src_install
-
 	dodoc CHANGES ISSUES
 }