Fixed to apply 2.6.31 patch, bug #278470.

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

5 files changed, 12 insertions, 109 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/Manifest b/net-wireless/broadcom-sta/Manifest
index cb009143610c..8f27f9839b5c 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -17,8 +17,6 @@ DIST hybrid-portsrc-x86_64-v5_10_79_10.tar.gz 694247 RMD160 75b7e5c74957bc6bf5fb
 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-r2.ebuild 1314 RMD160 0ec8f153f6c3721edea5ceeae13e0b93b5bed7a9 SHA1 311f2862d6d006d412c083e8807ecc7463b70caa SHA256 0e69730b31b93fb377b62c1d21d7a8198fea820f95ee39514d827356666b83c2
-EBUILD broadcom-sta-5.10.91.9-r3.ebuild 1449 RMD160 38bdf5aab959a3e4764269dc9e949a3b8cb0ab28 SHA1 3bbd15895840effc2e5031b95c87593d5077cf0c SHA256 71c8dd1b36f40b10c5c97ecab52eb4b9bf5de24a8d25547cb323842673627609
-EBUILD broadcom-sta-5.10.91.9-r4.ebuild 1489 RMD160 e9d5c652afea31d3dc064bc49c476613b22ea6e4 SHA1 62942420f14e5fab298a1fa9653de524bc402b98 SHA256 8677f248dc4e933fc6308772b32f4eb1dccbe8a8907c2a639b357143d1dc5a74
-MISC ChangeLog 2902 RMD160 24ef6dd76a88fb70399229fc9e54e3d751c2d010 SHA1 699c7388cbd57c4e13ec7173d9eb26edaf7f9af2 SHA256 625637bb8e59fafcb8d6c846e3e30ad1b5489b6bfbed9c85b30c99496dd5ad32
+EBUILD broadcom-sta-5.10.91.9-r5.ebuild 1491 RMD160 124f7ff155e636b09e44ea765e3bfa2461dce14b SHA1 c6cf0bce282cf47b4de9fc77bb3bd7588e44fa20 SHA256 2f5ca4cb023c21a469f1c927e43476024eb8d053143595e954150b76a4957d3b
+MISC ChangeLog 3204 RMD160 f65ffda645dbb0709ca379c2856b09f1aea942eb SHA1 12df184ad97787e225c798b40d7554d5bd6aa56f SHA256 ceb398bfb03f557bcd96310531858da9646b5e49ee5af33425210d205d0ce932
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
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"
 }