Version bump. Proxy commit for tomboy64@sina.cn. Fixes bug #517036

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

3 files changed, 78 insertions, 22 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index bcf2af42c6e3..02b8adc81fa6 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.59 2014/06/23 17:49:08 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.60 2014/07/15 23:59:47 mrueg Exp $
+
+*broadcom-sta-6.30.223.248 (15 Jul 2014)
+
+  15 Jul 2014; Manuel Rüger <mrueg@gentoo.org>
+  +broadcom-sta-6.30.223.248.ebuild:
+  Version bump. Proxy commit for tomboy64@sina.cn. Fixes bug #517036
 
 *broadcom-sta-6.30.223.141-r2 (23 Jun 2014)
 
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index e3f6981e46b3..3e9cecfe60e9 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX broadcom-sta-5.10.91.9-license.patch 716 SHA256 53544703c15eb5e7f35721c436bfd0acf7db3de1df83b2e344bfc7090cb14cf1 SHA512 abdea6d154e66f43fd629eefe3dfd19a43318acfc54b3ac52abd9c8e839d25971214971b14429f5fb09091fbb16793d2ce3db1093c2ccca9496975085156b94c WHIRLPOOL 98ec882b0b0db93e5a19bc7aa465c7c758f3c36bd3fa5159458520b4d1a298549c5072a46f50d351dc48cfb01216b11a164291539f72455d37caad593d61483a
 AUX broadcom-sta-5.100.82.111-linux-3.0.patch 935 SHA256 cd349fef72bb33025e59105fefa69c3e60066985707f396e03235102ca938137 SHA512 00e3139158b53f80d03bb6aa5b4eb3435cc453b100ee57b638a138ae0b624c88946c63dc20d559f05bee451275d7662dfb8c29e68de11ebe04c8df87a6a86f70 WHIRLPOOL 84d0d41e8a3e2b0b248ffe5d4c5256c68e1533aa58049a34ffc98e5f0bd0a2a20cffd58adf20cdced79096d10134bec474af5f9666a225c2103dfffc93b030a8
 AUX broadcom-sta-5.100.82.112-linux-2.6.39.patch 564 SHA256 2df2f242d6b34118cecbb8fb5c209356bf095436e8b553705f9f9f022648b53d SHA512 5b69b3b41af0a2f090b3fb021c188a846207b59ba0baf324cf4c93a5d3f9105fcd8f7e0aee592ebe0e898dd39c1988c65c8adeba643f1899f35287b0362b043e WHIRLPOOL 3d7dc0e31422b960038d52f5c62e15d1f0980dabb304cfc8cecc897af985a4ddcfaa90fb98150c25b2bc8040bb76c5c3e0b2afe8b7871397fbd20ed4a60debad
@@ -24,27 +21,13 @@ AUX broadcom-sta-6.30.223.30-makefile.patch 497 SHA256 3f1332be115991f21b03cf50d
 DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_amd64.deb 1779122 SHA256 de6529ae67f339aee185be93e3c12ffa944ef6b4807d176d6fda661de52136ba SHA512 93b17029538ec17be61902f1e5237a300f532dc88fd7475ac202c249a9cec099c5d170b0ebc043e1bda1987f6f925b6a28d4aa80748218f735a3790ded0565cd WHIRLPOOL 47f54a2fc286e58adef1383496fe3e65430ef643d8e7b8830cb87c0558319780f71944296211c62ccccaa4e3a216019fc5a29dd48903240362c656bb79ae55c2
 DIST bcmwl-kernel-source_6.30.223.30%2Bbdcom-0ubuntu1%7Eppa1_i386.deb 1732452 SHA256 d689040ac2ef67b9947f892b52764cd94c2090499747b57d63c2b40c7bc8eabb SHA512 323db5e6c8fc702990d7137bd11d2e8bba7ed073ee8da00125d147872edf90dd051a959198dbdaf92808403cdcfd582f17afb8a6f5e741382d3a0cffd6ce130a WHIRLPOOL db24f078e2639f609021028304e7caf48b9a3737b6fdf4b2522ab74606c6cb0b11a94706978b1fd1acdf66c59e351a4a433cf9e500862931a1e9dce6e5562c01
 DIST hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz 1735911 SHA256 d57c33f6bf4ebe68cac67ffe39c2260b8990bb0f07413dfd021dd4db845199a7 SHA512 adb3d9d9375888df3317d6af3d6d45c53412a677e5431051cbfe8c9eac3b13760022fd9b970e77caaeb0fa010ee8bd32ad80076d7279b60719bfb8562c09951f WHIRLPOOL f037e26d7f85d9a1bf3f2638fa6d6bbda43384e24fb249e90afcfff792be8013f1e0f2a1876c4675e39911d4e4877f0ab785eab15f7a6460621fe14c21bab486
+DIST hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz 2824762 SHA256 b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad SHA512 9f067cf5e1be562c78252791c0b2324b568c8533903842e18e92f2b10c3277e1d15ed42a5925acbd443de373f5113d05447b885a8d52ef57695babe48d68a0ff WHIRLPOOL f3bfef5b3dcbf6d051facbda0078a9850a1cf2f851bca07fd7538ffc3d5c0bf118622d217bb7737fdd87825af73b61ddd2d9a52c3d13a8070be02d1a584a8b14
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz 1786627 SHA256 5f37b2b879e29b220dc64ce2e93d922dc231d4241da03bcbab15ced10e649b4a SHA512 a83defe4553f680b984bf49788377436c5f563f2920c129d87a3930fb6501d0f833d353acf229fa4f67b761e4564428c62bc1c8e3e23c0727d01b8c4f797f6af WHIRLPOOL d1ddc19e29a6927ae0f172613d429a92d5009515b4db1bc188b0ced41ff39565512d4f85721bcf4ddd0a951afadfd7bc303219ed93a20f83e1936a9c82717e47
+DIST hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz 2875739 SHA256 3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022 SHA512 ce1e9f7f52cd98eaba5cf4ec0c7276bddf3ad906a0111eb236665daca72f36139ca4a8af72658cf91b0eaaa8479e54f5bb3bce77a0cc9bc1966f044b76b8295a WHIRLPOOL 6393507f340f4244d8e40c81102e37f9df0d5dbc0ce4e0fd3ed187ddde6faf3be9bfae59371eb307d031974b5b6d1417c7c11fbdd51b9f3b168ccd83d48276d9
 EBUILD broadcom-sta-6.30.223.141-r1.ebuild 2605 SHA256 ce91b10fa7e94675055a595540144ad58cbf9b78734697ae22602739029384bf SHA512 ae843cbf47edc80720e72e5fa679941cba9b82aca560f0dcfaf2b5393062554e9cb6399cd19f1942d347aeb3b2cc151d736a369fa003a609df5373545e595f63 WHIRLPOOL 430f445b0c14b9cb808f0e7a100a066a997c770e7d07aaee5c974439d3f88c986146b8ce1ff9161ebae63d855e6369e6beda547d069adf505e420d6dfcc38d11
 EBUILD broadcom-sta-6.30.223.141-r2.ebuild 2599 SHA256 37a8a947496997bc14368c22097f63dc9958baaacce2894848926517dca7fc9c SHA512 b3521717c6f8b7367343ab64290f665f61aa890dce6131c26635e0d8a59fa5f7a1fc9bbe3f9a27cecb4f9c497fb5bb378a34b773f4b4c06d2a6d2c7b9ba92dea WHIRLPOOL 0553f88a2888f88ad22020f7131d3ce8388e1d88bd6034d5c66d0ae1d0358bcadd87efd8a6fa59db773e10a8b0f31786a29e39908938749cc437fac8583bf0e6
 EBUILD broadcom-sta-6.30.223.141.ebuild 2723 SHA256 7db93e60885da6d38fe0252e2d5fa90f392130ffb3c9d403341a3dd5d1daba43 SHA512 8df8c3194986bc2c3dc85f14b6d5532004cfc3f57b2ec70c20a4d6a99fddccd4a46b86e766a3f957b7fd3ef0db246d9742ecb3e7c69748e11b05e7f01f2dd331 WHIRLPOOL 3c9761753496fef23f81d2a73113faa2620d828e66c7d6e7b35096c61c5e6de310afcaca0747ce9da77dda98fb0a084a9e178e878515f6c36cfa983575710649
+EBUILD broadcom-sta-6.30.223.248.ebuild 2626 SHA256 7b37822f931a5e988962f2a92edc872c4b157ed3fd8353ea9b820f5eab4b7e91 SHA512 3ae9a2290ad56fbfbffcc808fda95d2ecf01e4b6aeb969da1d884e6918bdd71fcfc37e43bceaabc49924b239ff3aa0b1b03ea89d6542b503ad76784e288dfeb2 WHIRLPOOL 930b6768a8f308041873fee12369d50978b70df96389923d93140e30997bbe19a9fb662afbd83fea9ff80f2a7f9ed3762f21362f6538bc37a3d009b0ab724e64
 EBUILD broadcom-sta-6.30.223.30-r2.ebuild 3189 SHA256 cd6ca47eeed6efa523b3a1e8b4e3b26bee16a6c42a4464ae6cf5291bdf707326 SHA512 1bf1a624b7ad5efed2c9bcff444d3bb13e1279f3e3b8e5248ed77eccec1e6a545528d229ad9a37607ae626c103f717a7fe9d1c03fe99ea895e9900c70a1a7dd8 WHIRLPOOL 7e2c64973f1b1abb9b5571c6713b315a8b244c7fa980dedfb280830e283a2764846af4854edd06f652f1fab1f56d570cc6a37de582b2295e8e86c8ced848a4ba
-MISC ChangeLog 14508 SHA256 0f1664b27efe66e665f08722d401a5efe12e3902480a5bd031012c585fe0c3c0 SHA512 a5d8b59799c960189d838b7743d6382027e3e2030d381b6102a826bccb28c7d8db451840ef7221aff79c75c6b4469f9d081aa0dd194c0e2a59dfa1d471d5ab2e WHIRLPOOL d3d2f42344125271c02c7f17540521a352d0745203d2fd5228753016ff182a97721d2e2dd5725498936dcf21187b4be92c7799ba08b18dfb7b9161d708df22bd
+MISC ChangeLog 14705 SHA256 c08210af9b4050ef2f37c6bab739e6ba300fd5c034fb4e6ab4eb636cffa9cbf7 SHA512 d3d98e4366cd6e93ef4b56544036efc45d40651341fac1c1ca5c68d74ac7456f0b796665cd5ac5cb4da749525f1b978e69fc9cae1898369047b39abf383cee49 WHIRLPOOL 435398aaa8a1013a5684ce72bb2ab8f43486ea77d19af70dffc1f589b9279ad58853a1df324fe06b167e55896623ce72eedf9f51286bc79bc10ff2bc3a34cb7d
 MISC metadata.xml 231 SHA256 1be6a1cf2be181172bfc3474a5815af1d8bca1e0c3b549be12b2cc6acaa7a665 SHA512 6ce376c5f35f2025d1b06b9ed0394f15011918553f5c4d46257998db2bfda39ec837d84527fdd9315c43c3dc16d2c5b9f78fdf27da4e024965a84441ab24fedc WHIRLPOOL 932d4cbd0f64b2cf8b2932576069e47149ae20a54024bb9ebfbb9ad8026413859a8299b102927fae3b708a02a98ef3d89ca1d9c09b1c840f348c85d782cd9b6b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTqGhzAAoJEC7dUkA7aK9HiI8P/Rj9yrKEbWpE9j8YgRRmbGdq
-xbi+hLbP/yM5JtaetuVkt+H0tula5hgyxIIAhvNgzqKWeUr4+eZpyxj2EMlkYTOW
-babawRL2jCPno2LoMtwKDTV/wc0JtHelgLbo37eKmRXf2zUF7LoZ3bSFVaqapIuW
-6ZEerOm3fxsP+kWs1Bn8/LvYmMc0yzplEcYNZG4UT5FO4RLJZxitUsuTL5WNuhfw
-KABBUpr+4KTytJV9YvrgL1ElBsPi5V6PfT0eLCm+4O0aFde56nZCiscMgG8lq5as
-Ujkpe2eqpKMu/iX8775wB9HLSrt63FnDcIOo4OZcsPbI8ao1kEbAP6UXLYOVYIeq
-SYfWFugFmmZSv25Glvw1mmXLwfNS/bO15AwFp/IpFaOqaGT80hKJelVylWrye+71
-R1S+RZjVqsSSl/u5KqC1qlzNpwcvHwqgNV4F0Y55Mv16fZe4hV08k1QajiEQa7Jd
-phHKxCenHazk+vkQNgucOFnmzSUGFeo+p6eDmt2FMdZIuOJC1hbiqxWetGmXDuKd
-WogeCMSW1Tv2lvmEoRO7FFoA6ISxdywyMZmY9gPXjrtmRt69PViyMcyLLH5XVkpt
-wtGpTLZ1Up/gTzzuVhlvOB1oPjOj2nucRlSNKiOpAoS+jKPTKuZkx3/YOjBIXJoA
-FS5/oGFhWN62Rml1xdKH
-=ZVJk
------END PGP SIGNATURE-----
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248.ebuild
new file mode 100644
index 000000000000..82870884c63f
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-6.30.223.248.ebuild,v 1.1 2014/07/15 23:59:47 mrueg Exp $
+
+EAPI=5
+inherit eutils linux-info 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-v35"
+SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )"
+
+LICENSE="Broadcom"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="mirror"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+pkg_setup() {
+	# 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"
+	CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
+	ERROR_B43="B43: If you insist on building this, you must blacklist it!"
+	ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
+	ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
+	ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
+	ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
+	ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
+	if kernel_is ge 3 8 8; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
+	elif kernel_is ge 2 6 32; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
+	elif kernel_is ge 2 6 31; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
+	elif kernel_is ge 2 6 29; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT 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}-6.30.223.141-license.patch" \
+		"${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \
+		"${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \
+		"${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \
+		"${FILESDIR}/${PN}-6.30.223.141-linux-3.15.patch"
+
+	epatch_user
+}