Version bump. Fixes building with KBUILD_OUTPUT or O= set, thanks to Miika Linnapuomi in bug #126306. Backported remove-old bug fix from upstream.

Package-Manager: portage-2.0.54

6 files changed, 108 insertions, 5 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index cc7afc4c0fe1..c64c7a6f5b55 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2006/03/26 16:45:30 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.33 2006/03/31 15:10:10 brix Exp $
+
+*ieee80211-1.1.13 (31 Mar 2006)
+
+  31 Mar 2006; Henrik Brix Andersen <brix@gentoo.org> files/remove-old,
+  +ieee80211-1.1.13.ebuild:
+  Version bump. Fixes building with KBUILD_OUTPUT or O= set, thanks to Miika
+  Linnapuomi in bug #126306. Backported remove-old bug fix from upstream.
 
   26 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
   ieee80211-1.1.12-r1.ebuild:
diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest
index 335195f30de8..a35880fc9200 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,7 +1,8 @@
-MD5 82e16e2fa7a8e1052650d58f6a49c5f9 ChangeLog 5891
+MD5 492b9c6b12d530d9f9d40c56b35204cb ChangeLog 6176
 MD5 dde1f1dcca13affd78fa2e897e2f4d8f files/digest-ieee80211-1.1.11 64
 MD5 b01b59d2e10994fca69752000797a94d files/digest-ieee80211-1.1.12 64
 MD5 b01b59d2e10994fca69752000797a94d files/digest-ieee80211-1.1.12-r1 64
+MD5 84a851e76dcd594fe286c11bf1359a9b files/digest-ieee80211-1.1.13 64
 MD5 9501aacea3c39a93671e12bdcd199254 files/digest-ieee80211-1.1.6 63
 MD5 0df9ca80228d166621f6d0ed424cd6a8 files/digest-ieee80211-1.1.7 63
 MD5 5cf798889745b65cb107070ad36c513c files/digest-ieee80211-1.1.8 63
@@ -9,10 +10,11 @@ MD5 f78d58df9a988441f01c24ff0c272712 files/digest-ieee80211-1.1.9 63
 MD5 e6b0f71cb5de5a5970e4af4669bf1af5 files/ieee80211-1.1.12-qos.patch 675
 MD5 25712fc02023480caeaea4de0395802c files/ieee80211-1.1.12-tkip-qos-new.patch 1536
 MD5 4c49e8e5e739551dd8a68f88131529a4 files/ieee80211-1.1.8-nocast.patch 959
-MD5 1c7250a90205590d6a477efdc0efe963 files/remove-old 1444
+MD5 1f23d886a8ac044db818e796a765ef34 files/remove-old 1460
 MD5 7f872d1dde3f0ad85fd5c0568e6adf07 ieee80211-1.1.11.ebuild 2797
 MD5 cfcd4b85f6de7fabf932e0555ed48242 ieee80211-1.1.12-r1.ebuild 2903
 MD5 dff443405f26c0509471c52fde07653a ieee80211-1.1.12.ebuild 2805
+MD5 b9f86d9c0fd03d6c8df8e794b648d0bd ieee80211-1.1.13.ebuild 2925
 MD5 235feb4dd8b67f34ae515471178b4b43 ieee80211-1.1.6.ebuild 2784
 MD5 36dc3b6f0347b90dd9daca08a2132dd8 ieee80211-1.1.7.ebuild 2792
 MD5 f7bec8760a5c0feb2b4038f4d82f19db ieee80211-1.1.8.ebuild 2849
diff --git a/net-wireless/ieee80211/files/digest-ieee80211-1.1.13 b/net-wireless/ieee80211/files/digest-ieee80211-1.1.13
new file mode 100644
index 000000000000..db1e4bff957b
--- /dev/null
+++ b/net-wireless/ieee80211/files/digest-ieee80211-1.1.13
@@ -0,0 +1 @@
+MD5 062debe7a4042ee5969607a810fb89fa ieee80211-1.1.13.tgz 67289
diff --git a/net-wireless/ieee80211/files/remove-old b/net-wireless/ieee80211/files/remove-old
index cf354e684003..d039afa41ec3 100644
--- a/net-wireless/ieee80211/files/remove-old
+++ b/net-wireless/ieee80211/files/remove-old
@@ -45,7 +45,7 @@ ask_remove()
 
 		n) return 1;;
 
-		""|y)	find ${KSRC} -type f -name 'ieee80211*' | \
+		""|y)	find ${KSRC} -follow -type f -name 'ieee80211*' | \
 			while read fn; do
 				[ ! -d $fn ] && (rm -f ${fn} || return 1)
 			done || return 1
@@ -60,7 +60,7 @@ do_check()
 {
 	echo "Checking in ${KSRC} for ieee80211 components..."
 
-	FILES=`find ${KSRC} -type f -name 'ieee80211*'`
+	FILES=`find ${KSRC} -follow -type f -name 'ieee80211*'`
 
 	if [ -n "${FILES}" ]; then
 		for file in $FILES; do
diff --git a/net-wireless/ieee80211/ieee80211-1.1.13.ebuild b/net-wireless/ieee80211/ieee80211-1.1.13.ebuild
new file mode 100644
index 000000000000..8fdc65670b95
--- /dev/null
+++ b/net-wireless/ieee80211/ieee80211-1.1.13.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.13.ebuild,v 1.1 2006/03/31 15:10:10 brix Exp $
+
+inherit 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"
+
+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}
+
+	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
+}
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 7881b17dfec5..31a8e93a5eaa 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -9,6 +9,7 @@ MD5 a6b695cd887ebc8ee6d37d99971ff62e files/digest-ipw2200-1.0.9 62
 MD5 25bb7a22f5d3b003a58fc7a82d6b85d2 files/digest-ipw2200-1.1.0 62
 MD5 d65480e8077954294f049d6c4d023b3c files/digest-ipw2200-1.1.1 62
 MD5 80ae465d8bee456dcdd765d089b758eb files/digest-ipw2200-1.1.1-r1 138
+MD5 8170b85d9159eeade505c50929b21934 files/digest-ipw2200-1.1.2 62
 MD5 91e9ccbbcf86cc2b81eff3fc853cb760 files/ipw2200-1.0.11-debug.patch 3496
 MD5 a3a2dd68cce2a4d05217369daab108f1 files/ipw2200-1.0.8-broadcast.patch 594
 MD5 a2de4d35e783a2aae5708846d8a7637c files/ipw2200-1.0.8-slabcorrupt.patch 522
@@ -16,6 +17,7 @@ MD5 dd96f1bc93f2c8f03a81b87f641a5329 files/ipw2200-1.0.8-txbusy.patch 811
 MD5 e994df0999ba085974a28e98e317f702 files/ipw2200-1.0.9-qos.patch 918
 MD5 89bdf40b614036a932f84192e4092e9c files/ipw2200-1.1.1-diversity.patch 1165
 MD5 646b7e5aba19613998313aeb286f3e40 files/ipw2200-1.1.1-fw_endian.patch 2543
+MD5 55f822701e815b9b5fa308e59b2f4730 files/ipw2200-1.1.2-modverdir.patch 980
 MD5 fa29197797ebbf5db95a303892a231f1 ipw2200-1.0.10.ebuild 2883
 MD5 ed815b8c793ab509c84913c0c16e06e4 ipw2200-1.0.11-r1.ebuild 2946
 MD5 b9e8e1f57e42dc0faca0530fb8d34c37 ipw2200-1.0.11.ebuild 2885
@@ -26,4 +28,5 @@ MD5 d1428344ca6c3b3ece77f85fde18d2f0 ipw2200-1.0.9.ebuild 2935
 MD5 aa565eefee8fc1398afd4037497b7eac ipw2200-1.1.0.ebuild 2887
 MD5 2fad5a5720e57d795a3d12a641289a34 ipw2200-1.1.1-r1.ebuild 3145
 MD5 a51b1ea769eb184cdae3610ef0be015b ipw2200-1.1.1.ebuild 2890
+MD5 4d51111a1fdfd85a1fd1702dc13a9977 ipw2200-1.1.2.ebuild 2403
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255