Fixed to apply 2.6.31 patch, bug #278470.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 10 insertions, 105 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index b94daf52da5e..511cf141b2e2 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.11 2009/07/16 20:27:39 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.12 2009/08/01 13:17:56 matsuu Exp $
+
+*broadcom-sta-5.10.91.9-r5 (01 Aug 2009)
+
+  01 Aug 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -broadcom-sta-5.10.91.9-r2.ebuild, -broadcom-sta-5.10.91.9-r3.ebuild,
+  -broadcom-sta-5.10.91.9-r4.ebuild, +broadcom-sta-5.10.91.9-r5.ebuild:
+  Fixed to apply 2.6.31 patch, bug #278470. Removed old versions.
 
 *broadcom-sta-5.10.91.9-r4 (16 Jul 2009)
 
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r2.ebuild
deleted file mode 100644
index 8c99c9b68466..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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-r2.ebuild,v 1.1 2009/07/01 22:51:51 matsuu Exp $
-
-inherit eutils linux-mod versionator
-
-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 )
-	http://www.broadcom.com/docs/linux_sta/${MY_PV}_patch_2_6_29_kernel.zip"
-
-LICENSE="Broadcom"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-DEPEND=">=virtual/linux-sources-2.6.22"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	check_license
-
-	if kernel_is ge 2 6 29; then
-		CONFIG_CHECK="LIB80211"
-	else
-		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.79.10-hidden-essid.patch" \
-		"${WORKDIR}/patch_2.6.29_kernels" \
-		"${FILESDIR}/${P}-license.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r4.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r4.ebuild
deleted file mode 100644
index c5c5eb4d899b..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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-r4.ebuild,v 1.1 2009/07/16 20:27:39 matsuu Exp $
-
-inherit eutils linux-mod versionator
-
-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 )
-	http://www.broadcom.com/docs/linux_sta/${MY_PV}_patch_2_6_29_kernel.zip"
-
-LICENSE="Broadcom"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="mirror"
-
-DEPEND=">=virtual/linux-sources-2.6.22"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_setup() {
-	check_license
-
-	if kernel_is ge 2 6 31; then
-		CONFIG_CHECK="LIB80211"
-	elif kernel_is ge 2 6 29; then
-		# bug #276057
-		CONFIG_CHECK="LIB80211 COMPAT_NET_DEV_OPS"
-	else
-		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.79.10-hidden-essid.patch" \
-		"${WORKDIR}/patch_2.6.29_kernels" \
-		"${FILESDIR}/${P}-license.patch" \
-		"${FILESDIR}/${P}-linux-2.6.30.patch"
-		"${FILESDIR}/${P}-linux-2.6.31.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r3.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r5.ebuild
index c9b11f6d0ee2..8ac4b3e2b606 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r3.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r5.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.2 2009/07/14 23:09:40 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r5.ebuild,v 1.1 2009/08/01 13:17:56 matsuu Exp $
 
 inherit eutils linux-mod versionator
 
@@ -49,5 +49,6 @@ src_unpack() {
 		"${FILESDIR}/${PN}-5.10.79.10-hidden-essid.patch" \
 		"${WORKDIR}/patch_2.6.29_kernels" \
 		"${FILESDIR}/${P}-license.patch" \
+		"${FILESDIR}/${P}-linux-2.6.30.patch" \
 		"${FILESDIR}/${P}-linux-2.6.31.patch"
 }