Version bump, fixing compilation against 2.6.20.

(Portage version: 2.1.2-r7)

3 files changed, 107 insertions, 2 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index 1a6bd3d4a5da..82384f145f78 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/ieee80211
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.42 2006/12/07 19:40:29 phreak Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.43 2007/02/06 17:42:52 phreak Exp $
+
+*ieee80211-1.2.16 (06 Feb 2007)
+
+  06 Feb 2007; Christian Heim <phreak@gentoo.org> +ieee80211-1.2.16.ebuild:
+  Version bump, fixing compilation against 2.6.20.
 
   07 Dec 2006; Christian Heim <phreak@gentoo.org>
   +files/ieee80211-1.1.13-linux-2.6.19.patch, ieee80211-1.1.13-r1.ebuild:
diff --git a/net-wireless/ieee80211/files/digest-ieee80211-1.2.16 b/net-wireless/ieee80211/files/digest-ieee80211-1.2.16
new file mode 100644
index 000000000000..10eaf1b623b9
--- /dev/null
+++ b/net-wireless/ieee80211/files/digest-ieee80211-1.2.16
@@ -0,0 +1,6 @@
+MD5 052b9276e609ae1067d1e98b249e1aca ieee80211-1.2.16-crypt-fix2.patch 4231
+RMD160 dec37566fb469b17b7d256e102d197ccc4715302 ieee80211-1.2.16-crypt-fix2.patch 4231
+SHA256 5555aa277acadc8a3abf5330da1927c99fae25d1ab066967076d7df4c106b3ee ieee80211-1.2.16-crypt-fix2.patch 4231
+MD5 5d4ff0f2771c9c85c831b3787c8fef56 ieee80211-1.2.16.tgz 69887
+RMD160 4cb9b6a6d6ab58bf6ac107a8bb437336059830dd ieee80211-1.2.16.tgz 69887
+SHA256 5fce785a9c29718e8fa75614b63344ec2607720d1d675fa528d7781fe997fdbc ieee80211-1.2.16.tgz 69887
diff --git a/net-wireless/ieee80211/ieee80211-1.2.16.ebuild b/net-wireless/ieee80211/ieee80211-1.2.16.ebuild
new file mode 100644
index 000000000000..fd9c5d17e1a6
--- /dev/null
+++ b/net-wireless/ieee80211/ieee80211-1.2.16.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.2.16.ebuild,v 1.1 2007/02/06 17:42:52 phreak Exp $
+
+inherit eutils linux-mod
+
+# The following works with both pre-releases and releases
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Generic IEEE 802.11 network subsystem for Linux"
+HOMEPAGE="http://ieee80211.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
+	http://${PN}.sourceforge.net/patches/${P}-crypt-fix2.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=""
+
+IUSE="debug"
+BUILD_TARGETS="modules"
+MODULE_NAMES="ieee80211(net/ieee80211:)
+			ieee80211_crypt(net/ieee80211:)
+			ieee80211_crypt_wep(net/ieee80211:)
+			ieee80211_crypt_ccmp(net/ieee80211:)
+			ieee80211_crypt_tkip(net/ieee80211:)"
+
+CONFIG_CHECK="NET_RADIO CRYPTO_ARC4 CRYPTO_MICHAEL_MIC CRC32 !IEEE80211"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_CRYPTO_ARC4="${P} requires support for ARC4 cipher algorithm (CONFIG_CRYPTO_ARC4)."
+ERROR_CRYPTO_MICHAEL_MIC="${P} requires support for Michael MIC keyed digest algorithm (CONFIG_CRYPTO_MICHAEL_MIC)."
+ERROR_CRC32="${P} requires support for CRC32 functions (CONFIG_CRC32)."
+ERROR_IEEE80211="${P} requires the in-kernel version of the IEEE802.11 subsystem to be disabled (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 [[ -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
+		eerror
+		eerror "Your kernel source contains an incompatible version of the"
+		eerror "ieee80211 subsystem, which needs to be removed before"
+		eerror "${P} can be installed. This can be accomplished by running:"
+		eerror
+		eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_DIR}"
+		if [ "${KV_DIR}" != "${KV_OUT_DIR}" ]; then
+			eerror "  # /bin/sh ${FILESDIR}/remove-old ${KV_OUT_DIR}"
+		fi
+		eerror
+		eerror "Please note that this will make it impossible to use some of the"
+		eerror "in-kernel IEEE 802.11 wireless LAN drivers (eg. orinoco)."
+		eerror
+		die "Incompatible in-kernel ieee80211 subsystem detected"
+	fi
+
+	if ! (linux_chkconfig_present CRYPTO_AES_586 || \
+		  linux_chkconfig_present CRYPTO_AES_X86_64 || \
+		  linux_chkconfig_present CRYPTO_AES); then
+		eerror "${P} requires support for AES cipher algorithms."
+		die "CONFIG_CRYPTO_AES{_586,_X86_64} support not detected"
+	fi
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+	local debug="n"
+
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${DISTDIR}"/${P}-crypt-fix2.patch
+
+	use debug && debug="y"
+	sed -i \
+		-e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=${debug}:" \
+		"${S}"/Makefile || die
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/include/net
+	doins net/*.h
+
+	dodoc CHANGES
+}