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.

(Portage version: 2.1.2-r9)

3 files changed, 36 insertions, 32 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/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
 }