Version bumped, bug #345295.

(Portage version: 2.1.9.22/cvs/Linux x86_64)

3 files changed, 10 insertions, 62 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/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"
-}