Version bumped, bug #345295.

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

4 files changed, 14 insertions, 85 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 2ac69a96ec26..b145acedab76 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.27 2010/10/30 06:44:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.28 2010/11/17 15:31:38 matsuu Exp $
+
+*broadcom-sta-5.60.246.6 (17 Nov 2010)
+
+  17 Nov 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -broadcom-sta-5.60.48.36.ebuild, -broadcom-sta-5.60.246.2.ebuild,
+  +broadcom-sta-5.60.246.6.ebuild:
+  Version bumped, bug #345295. Removed old versions.
 
 *broadcom-sta-5.60.246.2-r1 (30 Oct 2010)
 
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 1e1892eac90c..f53d62868738 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,27 +7,11 @@ AUX broadcom-sta-5.60.48.36-linux-2.6.35.patch 1670 RMD160 66ed871880630e65e509a
 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-32_v5.60.246.6.tar.gz 886002 RMD160 769d174acf86f127e8d31ab584af08bd91325359 SHA1 5aa9fd0707b1e597c5e0b78866a65d4bca687a0c SHA256 bd61f6ea6fbf58d53da34d1088a73d5cef3f8e3daa383c8099e169077fba0a79
 DIST hybrid-portsrc_x86-64_v5.60.246.2.tar.gz 884707 RMD160 1d9eb5060b979eed80330871328c152d2c69049d SHA1 6d82434d8087aba9cbea6b46bcf97f14c4e6c1f0 SHA256 64c9a096e26402d956f7e4b335bbf28d25893bbc248a57565915c7eaac381cea
+DIST hybrid-portsrc_x86-64_v5.60.246.6.tar.gz 884531 RMD160 762f6eb4154a55fd1892184898dfc031eb199f73 SHA1 b4ecb6f82fe0f943d40fb85ef7c34eb16fe0abf2 SHA256 d41d60d5d0968d2a695227f276ea2a939f9a77622e8607067a2a4a75dd290a7d
 EBUILD broadcom-sta-5.60.246.2-r1.ebuild 1940 RMD160 248f0685ddb001d48b7f151676825cc8f927584a SHA1 33e12a802f6670efb9ee905313fb4c6725ad4952 SHA256 98de3494ad7d8da8a889df9623215f348dc6c7b22bc09b66b456e52ceceedbcd
-EBUILD broadcom-sta-5.60.246.2.ebuild 1895 RMD160 a8c46732c0152988f87779f7bb875112a1e1ab9b SHA1 65e565a16b661228fff60fd0ac2255c844b932dd SHA256 662b22266eee363cad4163380b9aa758f513c268e4ad12323b7758c46c28cc3b
+EBUILD broadcom-sta-5.60.246.6.ebuild 1907 RMD160 03442259c9774358419cde4080f012ec72f95eab SHA1 9abb77d2ac56ce82edffb9012a368dae0b2e79a4 SHA256 310e456d98e9fdca0ff6c404768bec9c8da56f84eb88de129a19afbd97a91448
 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 7047 RMD160 2ccbf9706b356c02d27952329cc1d4911ec34fc1 SHA1 f9ee6cda0b9f067dce371f65ad138f1cacc98b5a SHA256 904429f64866e9d87ec804c357a09e7dadf72b5f1aa864031f2ac13bfc43e893
+MISC ChangeLog 7293 RMD160 ab1e724c73bf69d29388c4502ffadf810fbf7557 SHA1 4a1ad8a1e490531f0ae5916e88d698413d32fffa SHA256 52af42cac62ab588e616c67b51c72ad893d1b0375e339b75f49b35aaa6037332
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMy77IAAoJECaGw+YFKA1prXkP/3MxIcQtiu+0IJnQIuJZX028
-E8FXG3qSo0N3y+QD6g1Ginz2PcIpgKwL97QpI+KCmLOnk/6IBX7VjazL7HomniAK
-UBiQdMUcsWK4F/mkwakxiRb5eFUVj5qH3vi07qZ80DXP/5j1ofyr2K2CiWJ5mOoy
-ZW/Oy4YQGABpUl+yykX9d6II76DXc9L76Ab5qGNzFSJaKetedukS+bnnKb6nVB+o
-Fy4lvop2QZNJ7ERJs7bq3QTnNS9AgMEDCksrZyfOJDS+b3V32Ie/b/0FHQKCgPw7
-68DfUUpn7ev+dMAjnaQpja4evtWZEfND97E233ZIGkPYn27x6+j6ncPi/9+Wtt5x
-wUrlkEZ8+n8jmGJQ+oU6iid6RsHPaLcIjct/4PyBOjiQ4/8tbnMetnTiXWWNQdoA
-C/3o1sixnFV4NRMM+Ma5e0hZ6BA92hd8jaPVDSzd0Ximm48wJ78fXSC66rrsoBgQ
-aI4mz5IQ7Tp6Q2Cy2eCONdGGM6Qr1Fhv833d2+v+DOTQCeOi70ZntcEQrU0/lSqX
-VJKAKsORLi83D3lj5R0TYiK/sOyxc2aKRUr8PxpOP7+M9ufFksOo1vkMtMM4LZ/U
-eFTvEVMGjWTqm1TF25SKhCPWzIetYuuqULL27vtf39cGrVc3rMiYQkleJ9nsGpah
-yJoFSNEiFCCTIFFCM2ek
-=ZZSK
------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.6.ebuild
index 8272cee7c8b4..691702e3f298 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.60.246.2.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.60.246.6.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.60.246.6.ebuild,v 1.1 2010/11/17 15:31:38 matsuu Exp $
 
 EAPI="2"
 inherit eutils linux-mod
@@ -53,5 +53,5 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
-		"${FILESDIR}/${P}-gcc.patch"
+		"${FILESDIR}/${PN}-5.60.246.2-gcc.patch"
 }
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.60.48.36.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.60.48.36.ebuild
deleted file mode 100644
index 17fb6d10f2eb..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.60.48.36.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.48.36.ebuild,v 1.1 2010/02/12 11:26:41 matsuu Exp $
-
-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 CFG80211_WEXT WEXT_PRIV ~!MAC80211"
-		CONFIG_CHECK="${CONFIG_CHECK} LIB80211 WIRELESS_EXT CFG80211_WEXT WEXT_PRIV ~!MAC80211"
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-5.10.91.9-license.patch" \
-		"${FILESDIR}/${PN}-5.10.91.9.3-linux-2.6.32.patch" \
-		"${FILESDIR}/${PN}-5.10.91.9.3-linux-2.6.33.patch"
-}