Version bumped, bug #285421. Improve CONFIG_CHECK.

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

3 files changed, 20 insertions, 15 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index acfea0f07abe..8a47268eabfb 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/broadcom-sta
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.13 2009/08/08 00:02:37 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.14 2009/09/19 16:43:22 matsuu Exp $
+
+*broadcom-sta-5.10.91.9.3 (19 Sep 2009)
+
+  19 Sep 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -broadcom-sta-5.10.91.9-r1.ebuild, +broadcom-sta-5.10.91.9.3.ebuild:
+  Version bumped, bug #285421. Improve CONFIG_CHECK.
+  Removed old version.
 
 *broadcom-sta-5.10.91.9-r6 (08 Aug 2009)
 
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 9cd68bd25d0a..cc749ffa40b2 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -11,13 +11,15 @@ AUX broadcom-sta-5.10.91.9-linux-2.6.30.patch 563 RMD160 38cf728878ee53edb9b1eba
 AUX broadcom-sta-5.10.91.9-linux-2.6.31.patch 1410 RMD160 b0212a6a58d3c62fa7750b9d7aeebe773ed3d4e3 SHA1 3b84515c21b6852da74be389b46d0b067361d49d SHA256 bde3eed4317fe99b3e42f98e396a13a339add9680d403c3f07d2c5a75319de7b
 AUX broadcom-sta-5.10.91.9-r1-linux-2.6.29.patch 5209 RMD160 83ee25d1207c6e33cda74078620dcff47801e300 SHA1 5f3e835a4d448de7b5085af22140f84ee21e4fa4 SHA256 96c708d578b8e34ea0e17452681cd5d7acbfeea5d65e7bacf40d5b4c5aa7dfa8
 DIST 5_10_91_9_patch_2_6_29_kernel.zip 2429 RMD160 3700932373b67bcf92d1d6b7ae80d580b294de70 SHA1 5bfe1c183f87901b9b994b97b2ee75e0dd2a4406 SHA256 128b7601d651280119f3dc493497946f68555a41d9d37c8b7c8541a61717eb02
+DIST hybrid-portsrc-x86_32-v5.10.91.9.3.tar.gz 604412 RMD160 928b33c6ddc16d7479caef5b90f8cbbd8f0d8cc1 SHA1 80b413d810cbb3dbc8e2e7dfff9364656d042198 SHA256 b3c5a6bea957414ee69118d7917b5c04364f84318a0b045740e3707412e6a343
 DIST hybrid-portsrc-x86_32-v5_10_79_10.tar.gz 697799 RMD160 3a91a8b91d7b062f3ce8ceb55435ca7c1362effa SHA1 f5f2650395dd18b6403a456877ddb55e89b72eba SHA256 f9084cc1393f48d9ca546448e5a5caf49f8f25614353596256039144d2bb5f25
 DIST hybrid-portsrc-x86_32-v5_10_91_9.tar.gz 605561 RMD160 3b7acf00fde619655da92baea2e947089749cefb SHA1 ae2c3798ed1864af9b0801332e95590cb66b1602 SHA256 8bb063e5c3b2ff4b8f6623a2a48f616b420f6ad5a13ac1fbf56ce94845d2e3d1
+DIST hybrid-portsrc-x86_64-v5.10.91.9.3.tar.gz 601391 RMD160 9c5e014daabad654ae725e55850fa165976acf41 SHA1 a426712617bf3f1c03a0012e087a4735b527c53c SHA256 2cc313f7ecf8fc7efeb8e5c4023ecf9b63dbd318e3f1b1fcb1c81c2c98429e8c
 DIST hybrid-portsrc-x86_64-v5_10_79_10.tar.gz 694247 RMD160 75b7e5c74957bc6bf5fbdeb28ec2c68f1d835f1a SHA1 f7bcfd6990d273b7af9f6fd7764f5359a3fbebc7 SHA256 1815cb78ddebd4d21243d83ef073f799707dd7908e64456e81be4a4d45bedc02
 DIST hybrid-portsrc-x86_64-v5_10_91_9.tar.gz 602794 RMD160 58205c27754c8f45b8b033c2f611299ba360f803 SHA1 6a80be30749d31c6dff90e562dd37cce6abde390 SHA256 9ac8db79daa95f4ff3b64f997fe8d3b3979231973905ef7fcecc04cf4ba5d805
 EBUILD broadcom-sta-5.10.79.10-r4.ebuild 1316 RMD160 27a0b4e74fdd11ef9805fc2a25e5404146ee0380 SHA1 86500d02c23d87053831d4db8c05f5c775895125 SHA256 ee9dd56310283b62fc756b9fea3f63de20954d7fef45a59d79b969837d572516
-EBUILD broadcom-sta-5.10.91.9-r1.ebuild 1300 RMD160 ea01dae91ae86cb008daacb6034d6cf6bdd334d0 SHA1 7b6377fba2b8e74d69b5fe7aa5d8fa719459077e SHA256 322326ed73a786d55bb766d74befe2cb0bd25dba59e589c646c3791e7c80fa71
 EBUILD broadcom-sta-5.10.91.9-r5.ebuild 1491 RMD160 124f7ff155e636b09e44ea765e3bfa2461dce14b SHA1 c6cf0bce282cf47b4de9fc77bb3bd7588e44fa20 SHA256 2f5ca4cb023c21a469f1c927e43476024eb8d053143595e954150b76a4957d3b
 EBUILD broadcom-sta-5.10.91.9-r6.ebuild 1344 RMD160 671797cea7ae5534f1cba11cf1f429429b5adcf2 SHA1 2132c113e9e4103af27d6190ff58bab30955f192 SHA256 b9d604fcc84182e65d7cabc2facdad811ab0f0b705e1a937ff6b72c5c21adee0
-MISC ChangeLog 3379 RMD160 c99c4e23d053fdc5e22daea96464c7abfa794735 SHA1 5ddb06abfb687dd9bb0173824102982f8d53a921 SHA256 119e68b9511e1a345fde538229c6e68fcd6573d5493f46ae1ce428c846896cd7
+EBUILD broadcom-sta-5.10.91.9.3.ebuild 1153 RMD160 56da89788467cac7c648d016e13d81de0a9c618c SHA1 6250e63445c95731c586e557b4c9f82526972214 SHA256 2473b8e47c43f83eeb86c76af5781c9144866d2f8f4b07fa6c9241486e067f1c
+MISC ChangeLog 3617 RMD160 d340cb57b3f52646b98f2cd3a14e7e15c674ea08 SHA1 20daf9481e1ca05b346b5d7ffaa68c9350f67756 SHA256 23e8974db2d275cc4eb9bb16fae955595e62150daf14169d5c1e0880a036487a
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r1.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3.ebuild
index f649d0b32751..f9541fad084d 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r1.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2009 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.10.91.9-r1.ebuild,v 1.1 2009/05/07 16:08:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.3.ebuild,v 1.1 2009/09/19 16:43:22 matsuu Exp $
 
-inherit eutils linux-mod versionator
+inherit eutils linux-mod
 
-MY_PV="$(replace_all_version_separators _)"
 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${MY_PV}.tar.gz )
-	amd64? ( ${SRC_BASE}64-v${MY_PV}.tar.gz )"
+SRC_URI="x86? ( ${SRC_BASE}32-v${PV}.tar.gz )
+	amd64? ( ${SRC_BASE}64-v${PV}.tar.gz )"
 
 LICENSE="Broadcom"
 KEYWORDS="~amd64 ~x86"
@@ -28,10 +27,11 @@ MODULESD_WL_ALIASES=("wlan0 wl")
 pkg_setup() {
 	check_license
 
+	CONFIG_CHECK="~!B43 ~!SSB"
 	if kernel_is ge 2 6 29; then
-		CONFIG_CHECK="LIB80211"
+		CONFIG_CHECK="${CONFIG_CHECK} LIB80211"
 	else
-		CONFIG_CHECK="IEEE80211 IEEE80211_CRYPT_TKIP"
+		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
 	fi
 	linux-mod_pkg_setup
 	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
@@ -41,9 +41,5 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch \
-		"${FILESDIR}/${PN}-5.10.79.10-hidden-essid.patch" \
-		"${FILESDIR}/${PF}-linux-2.6.29.patch" \
-		"${FILESDIR}/${PN}-5.10.79.10-linux-2.6.30.patch" \
-		"${FILESDIR}/${P}-license.patch"
+	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch"
 }