Replaced 2.6.29 patch to official one. Removed old versions.

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

4 files changed, 16 insertions, 57 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/Manifest b/net-wireless/broadcom-sta/Manifest
index 2639ded0f4df..250dbdeef5fd 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -8,13 +8,13 @@ AUX broadcom-sta-5.10.79.10-wl_iw_v2.patch 719 RMD160 1744b2f19ae294f86b0aa37f51
 AUX broadcom-sta-5.10.91.9-license.patch 716 RMD160 f4af0c36ec10d5fd4500af94c3864f6a352883e0 SHA1 0f2458882656dbf73035e566e53b902bc22c37f4 SHA256 53544703c15eb5e7f35721c436bfd0acf7db3de1df83b2e344bfc7090cb14cf1
 AUX broadcom-sta-5.10.91.9-linux-2.6.29.patch 4668 RMD160 ec31ba4121cc9102b38da17ed06ed0b9624c51a1 SHA1 d103d610a69102d1d1c04737640ba1e3f76817cd SHA256 de0314451a9b24816b63beb10e1410ef23a26b151d949f0875209add77c5722d
 AUX broadcom-sta-5.10.91.9-r1-linux-2.6.29.patch 5209 RMD160 83ee25d1207c6e33cda74078620dcff47801e300 SHA1 5f3e835a4d448de7b5085af22140f84ee21e4fa4 SHA256 96c708d578b8e34ea0e17452681cd5d7acbfeea5d65e7bacf40d5b4c5aa7dfa8
+DIST 5_10_91_9_patch_2_6_29_kernel.zip 2429 RMD160 3700932373b67bcf92d1d6b7ae80d580b294de70 SHA1 5bfe1c183f87901b9b994b97b2ee75e0dd2a4406 SHA256 128b7601d651280119f3dc493497946f68555a41d9d37c8b7c8541a61717eb02
 DIST hybrid-portsrc-x86_32-v5_10_79_10.tar.gz 697799 RMD160 3a91a8b91d7b062f3ce8ceb55435ca7c1362effa SHA1 f5f2650395dd18b6403a456877ddb55e89b72eba SHA256 f9084cc1393f48d9ca546448e5a5caf49f8f25614353596256039144d2bb5f25
 DIST hybrid-portsrc-x86_32-v5_10_91_9.tar.gz 605561 RMD160 3b7acf00fde619655da92baea2e947089749cefb SHA1 ae2c3798ed1864af9b0801332e95590cb66b1602 SHA256 8bb063e5c3b2ff4b8f6623a2a48f616b420f6ad5a13ac1fbf56ce94845d2e3d1
 DIST hybrid-portsrc-x86_64-v5_10_79_10.tar.gz 694247 RMD160 75b7e5c74957bc6bf5fbdeb28ec2c68f1d835f1a SHA1 f7bcfd6990d273b7af9f6fd7764f5359a3fbebc7 SHA256 1815cb78ddebd4d21243d83ef073f799707dd7908e64456e81be4a4d45bedc02
 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-r3.ebuild 1277 RMD160 e13ed95d67083431df2517bd48dca6ceb55edce4 SHA1 511a44e14e2114ab903c26ca63dd01dc96657c3a SHA256 e56c6851d877b835c78b444db9cf24d732921fd03fa2904ad8c810f70e862df1
 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.ebuild 1259 RMD160 d02c922ac4a66e68c53fc3bfb174580255c2ceb9 SHA1 0a3141d0c5d6c81e5d8bf35776ae0cec65b7dcc6 SHA256 5732797edffaf01f22bf210c3767fa323613ad4f00fbf6a4ca9034709a7c89b3
-MISC ChangeLog 2038 RMD160 477848e90f4e97f9808225afa64468cfafa1261d SHA1 3c4e9bd4dbe1b5750c3d25c54eac7d20012375b5 SHA256 d41cc9b7257df5572bb70f9c7a3b3c5a5f9b2aabc2ffc20981cc85f219c75b57
+EBUILD broadcom-sta-5.10.91.9-r2.ebuild 1314 RMD160 0ec8f153f6c3721edea5ceeae13e0b93b5bed7a9 SHA1 311f2862d6d006d412c083e8807ecc7463b70caa SHA256 0e69730b31b93fb377b62c1d21d7a8198fea820f95ee39514d827356666b83c2
+MISC ChangeLog 2300 RMD160 c4fb7d9aba9c3ec4b833d6094525a1afc7161bc5 SHA1 13ba47ad35caf818d0be12e04122752be1e14b39 SHA256 02362efa0aec69daedd1fbbc8d4645b27e8bbc200a98e7f024fa29172d5633e9
 MISC metadata.xml 221 RMD160 ca5e46f2e947fcae430e49859acaa4b25ab9d4b4 SHA1 b7f58eb04a9aceeb67104c0b81719e6e97da97f4 SHA256 138123f5d6199cbcc391346419b7b81d3ae9153c17670b18c540ff75a2287371
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"
 }