Replaced 2.6.29 patch to official one. Removed old versions.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 13 insertions, 54 deletions

diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 6c66e58983f6..92239f6c65b4 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.7 2009/05/07 16:08:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.8 2009/07/01 22:51:51 matsuu Exp $
+
+*broadcom-sta-5.10.91.9-r2 (01 Jul 2009)
+
+  01 Jul 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -broadcom-sta-5.10.79.10-r3.ebuild, -broadcom-sta-5.10.91.9.ebuild,
+  +broadcom-sta-5.10.91.9-r2.ebuild:
+  Replaced 2.6.29 patch to official one. Removed old versions.
 
 *broadcom-sta-5.10.91.9-r1 (07 May 2009)
 *broadcom-sta-5.10.79.10-r4 (07 May 2009)
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r3.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r3.ebuild
deleted file mode 100644
index c08240e387c7..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.79.10-r3.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.79.10-r3.ebuild,v 1.2 2009/05/04 23:57:49 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 )"
-
-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}/${P}-hidden-essid.patch" \
-		"${FILESDIR}/${P}-linux-2.6.29.patch" \
-		"${FILESDIR}/${P}-linux-2.6.30.patch" \
-		"${FILESDIR}/${P}-wl_iw_v2.patch"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r2.ebuild
index 50dfc683a158..8c99c9b68466 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.10.91.9-r2.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.ebuild,v 1.2 2009/05/04 23:57:49 matsuu Exp $
+# $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
 
@@ -9,7 +9,8 @@ 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 )"
+	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"
@@ -43,6 +44,6 @@ src_unpack() {
 	cd "${S}"
 	epatch \
 		"${FILESDIR}/${PN}-5.10.79.10-hidden-essid.patch" \
-		"${FILESDIR}/${P}-linux-2.6.29.patch" \
-		"${FILESDIR}/${PN}-5.10.79.10-linux-2.6.30.patch"
+		"${WORKDIR}/patch_2.6.29_kernels" \
+		"${FILESDIR}/${P}-license.patch"
 }