Version bumped, bug #342255.

Package-Manager: portage-2.1.9.22/cvs/Linux x86_64

4 files changed, 100 insertions, 2 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 44b3394805a4..1afbc614390b 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/broadcom-sta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.25 2010/08/01 14:16:08 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.26 2010/10/27 15:56:35 matsuu Exp $
+
+*broadcom-sta-5.60.246.2 (27 Oct 2010)
+
+  27 Oct 2010; MATSUU Takuto <matsuu@gentoo.org>
+  +broadcom-sta-5.60.246.2.ebuild, +files/broadcom-sta-5.60.246.2-gcc.patch:
+  Version bumped, bug #342255.
 
   01 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
   broadcom-sta-5.60.48.36-r1.ebuild:
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 21228c7f243c..94cf5e5926bb 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,10 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX broadcom-sta-5.10.91.9-license.patch 716 RMD160 f4af0c36ec10d5fd4500af94c3864f6a352883e0 SHA1 0f2458882656dbf73035e566e53b902bc22c37f4 SHA256 53544703c15eb5e7f35721c436bfd0acf7db3de1df83b2e344bfc7090cb14cf1
 AUX broadcom-sta-5.10.91.9.3-linux-2.6.32.patch 576 RMD160 17d1f0e2ea7e507bc7c7522f7dee8d667c04c131 SHA1 3b13b5d10b199da0590f7b9fed6694e23369596d SHA256 55ef2c1f7be8414b2df89d9f118affa9650c94e95491ad7f9c112f06debdf5d6
 AUX broadcom-sta-5.10.91.9.3-linux-2.6.33.patch 551 RMD160 2e0385d005127de53d040df3a079a6facff6eb2e SHA1 3aad38866d5e5239f0b12c891db4372d679ed57b SHA256 08b2b9e401118be918e02634707120cf926677e7ae6fabc69158eb8b7a8cbfb2
+AUX broadcom-sta-5.60.246.2-gcc.patch 417 RMD160 aa1b67ace50a513d0ed1d04e14b21afb8cba51da SHA1 1c0095b3b4a79f3d036719f7c7a38d7e889c9ea1 SHA256 82ad7a047e8e384fe4a571e054fabb0f629c81012f035f3525fa51eb611cc736
 AUX broadcom-sta-5.60.48.36-linux-2.6.35.patch 1670 RMD160 66ed871880630e65e509af96586646589b8f0c08 SHA1 6173cb1442ba0cda520082bdb79ba7089b2e4538 SHA256 4ec98dc9395c117d5dbe0f0cb5ce2add82f2cf1892c833d79689889596b5152e
 DIST hybrid-portsrc-x86_32-v5.60.48.36.tar.gz 886115 RMD160 b3901897e50419d704d6ca5ece12c4def0dce3d5 SHA1 07d955afe599466b0e25bcc507186f5b50f1a171 SHA256 ef3f101190aafb19a720306086bd3eda1180dcf602cb150ddbf6a98b2d544c6a
 DIST hybrid-portsrc-x86_64-v5.60.48.36.tar.gz 884584 RMD160 5a0d6df5513b2218b5e06ef894c59b665e412267 SHA1 1174a4d3102aa0ed45003556e03842668ef698b9 SHA256 dfd6c4616dd6e99032f6515eb2a79b6a6e15356f62b0db93b5a986064919836f
+DIST hybrid-portsrc_x86-32_v5.60.246.2.tar.gz 886200 RMD160 0bccfb4b0eed8777f170f336f336a83be8468b8d SHA1 53d0a3cbc7c7f5b0b75f8da0480a4069dfc66281 SHA256 fc3078bf48b5933f71baa219d492def1f69a6398a7b111a736450a27bd183857
+DIST hybrid-portsrc_x86-64_v5.60.246.2.tar.gz 884707 RMD160 1d9eb5060b979eed80330871328c152d2c69049d SHA1 6d82434d8087aba9cbea6b46bcf97f14c4e6c1f0 SHA256 64c9a096e26402d956f7e4b335bbf28d25893bbc248a57565915c7eaac381cea
+EBUILD broadcom-sta-5.60.246.2.ebuild 1895 RMD160 a8c46732c0152988f87779f7bb875112a1e1ab9b SHA1 65e565a16b661228fff60fd0ac2255c844b932dd SHA256 662b22266eee363cad4163380b9aa758f513c268e4ad12323b7758c46c28cc3b
 EBUILD broadcom-sta-5.60.48.36-r1.ebuild 1962 RMD160 bb6f8aaf40a5ccced29ed1f3bc5106ec746259be SHA1 2a43c85478c8a900cb18a3c3d6a3c4186ab521d6 SHA256 d33bf6854ad57e4363d5359d3420569b5e998eba9107c3b6f3f4eaf53cdf750d
 EBUILD broadcom-sta-5.60.48.36.ebuild 1851 RMD160 e818a344971c86ce2b55c3567fb7b8d0cdf65238 SHA1 9d715a0806d09653e0bb63226b5ba378bbff9098 SHA256 f00d89f0ece01f8e6b35f2837f1ced252491c0fe4ac029f46e44206cf851ca27
-MISC ChangeLog 6632 RMD160 75c986d652f39061411a66c4d5191bd88b0bc49b SHA1 ea7ff7cde2af1d2f2d7bb0a868a74d9dbe40ea22 SHA256 ddc8d8205e313bbed2579659a59e3326746d38092c0089e2391eee6fc82afc6f
+MISC ChangeLog 6828 RMD160 0d0815962257dd3ecc68a92f816bf61430438b36 SHA1 cb3d2dd71f40639cdb7f2c50eff9b50ebf1a174f SHA256 a8d7bb3590af189f6abcbf16235ac6767063d9d9f5e3ca9b9ad7e50bc8b330d4
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMyEu5AAoJECaGw+YFKA1p0BgP/0G6vS55ZZ5U5ffBaGkz4CUa
+a2MFlIBPDDD9ZP+AYZHgRFYUG0Y887eZBWQa5OxgzID9AMRl35QlqdM62ZrEcMIl
+THJxCD2DLVN9618+n1TUbq7uKhF2lJrKH9v1Q87Js91z4hqVdaWILKuyHOWxlhdm
+1nMOYTua5h+itJfmfmlKqCGwkf/885SjLIHNJFGek5infbaqZ74ZGd1f8emif9CL
+PYq3Lg664LpJDxqcGveyAsUsSRyuTSgk9IsLrp6Yw5L5yACqqbwyia8Xttg4lbzs
+gP+dJ0T1uVb54FG3jAYfLPgrz6iUvjBmfcQQMAdBUX451e34WblMHwyApUbgN2by
+oqoFLMWfeCqmtLXq5s3rWWVRcqQ+3nHdzdLaaXu7ikLu/acDpCZT3UhiIvtQzIrv
+Jj8hHg/gn5ufUW/C4Gat1vWnuJLh1zaidHYVzofjiWRUKNfANhv9Hggl3IPmtVWJ
+YbgE/ayR85vTdxNIy7nSDjYxfLrQNtuWOJvSbyOGfWUksMNshVrzKiCediunW74k
+4RXgDJFKhJaNg9lXQTJswCO00OXeYSoJHhyYp2ocd7X1GdltKdNe3YVlSxVAN0mC
+BMQd5TYK25ZkE6KWCeohy8/aC5BpvWJpV3PraiSa8Wu1JRnNAA0fdKz2C24IF4nA
+hs3/hKiDK5ZQDdXCUMBQ
+=Z13K
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2.ebuild
new file mode 100644
index 000000000000..8272cee7c8b4
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2.ebuild,v 1.1 2010/10/27 15:56:35 matsuu Exp $
+
+EAPI="2"
+inherit eutils linux-mod
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver."
+HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
+SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86-"
+SRC_URI="x86? ( ${SRC_BASE}32_v${PV}.tar.gz )
+	amd64? ( ${SRC_BASE}64_v${PV}.tar.gz )"
+
+LICENSE="Broadcom"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="mirror"
+
+DEPEND=">=virtual/linux-sources-2.6.22"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+PROPERTIES="interactive"
+
+pkg_setup() {
+	check_license
+
+	# bug #300570
+	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
+	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
+	CONFIG_CHECK="~!B43 ~!SSB"
+	if kernel_is ge 2 6 33; then
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT CFG80211_WEXT WEXT_PRIV ~!MAC80211"
+		ERROR_WEXT_PRIV="Starting with 2.6.33, it is not possible to set WEXT_PRIV directly. We recommend to set another symbol selecting WEXT_PRIV, for example, PRISM54, IPW2200 and so on. See Bug #248450 comment#98."
+	elif kernel_is ge 2 6 31; then
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211"
+	elif kernel_is ge 2 6 29; then
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT ~!MAC80211 COMPAT_NET_DEV_OPS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+	fi
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+	BUILD_TARGETS="wl.ko"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
+		"${FILESDIR}/${P}-gcc.patch"
+}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch
new file mode 100644
index 000000000000..048565376d75
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-5.60.246.2-gcc.patch
@@ -0,0 +1,11 @@
+diff -Naur broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h
+--- broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h	2010-10-08 07:32:59.000000000 +0900
++++ broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h	2010-10-28 00:50:57.925351964 +0900
+@@ -15,6 +15,7 @@
+ #ifndef _wl_iw_h_
+ #define _wl_iw_h_
+ 
++#include <linux/semaphore.h>
+ #include <linux/wireless.h>
+ 
+ #include <typedefs.h>