Add net-wireless/ar9271-firmware to blockers, remove old.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

7 files changed, 17 insertions, 190 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index 273eae93b3ca..f01a5e9c3101 100644
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/linux-firmware
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.29 2011/08/28 19:58:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.30 2011/11/01 14:40:57 chithanh Exp $
+
+  01 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -linux-firmware-20110604.ebuild, -linux-firmware-20110709.ebuild,
+  linux-firmware-20110731.ebuild, linux-firmware-20110818.ebuild,
+  linux-firmware-99999999.ebuild:
+  Add net-wireless/ar9271-firmware to blockers, remove old.
 
   28 Aug 2011; Markus Meier <maekke@gentoo.org> linux-firmware-20110731.ebuild:
   arm stable, bug #379997
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 77da06c9b71b..cc72c166d6de 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,21 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST linux-firmware-20110604.tar.bz2 14141616 RMD160 fdd4f463106274ba1d5dba07d2a513741b2aec2d SHA1 d5d9aac169d47d18745682dfe43992e50e48f359 SHA256 b41be8c42ec76657acb8d7267d843b6a798a5e976ab559ee2d7a065a77d2b4b4
-DIST linux-firmware-20110709.tar.bz2 15267126 RMD160 c4a77da8749bd062b411b95768dbf8ea8f249657 SHA1 19ccf162a10ed89ba4f02b942d60b78682361785 SHA256 f1b61c5ef9b9bd34eff2296dc40a4732939e687ef80f3d0e749f58e4a1990134
 DIST linux-firmware-20110731.tar.bz2 15251521 RMD160 18be95d4e230726c02764d6ee5b12dc546c72922 SHA1 57df268331586c10531ec2249b85ccedd114e98b SHA256 f7e122642b99727db63ec6cf2fb64037e7e49a2e5db59a62cdba444a273905d3
 DIST linux-firmware-20110818.tar.bz2 16023823 RMD160 ff8f4f7fbfc3f9608d44d72bbc5f544f562e1a2d SHA1 4279c2937f7fc834441a3e78e286e6688c873c99 SHA256 4cf4ac66e2b3cff7550857ec7fa52d9d274c0000b2486b701d16f6e9cc57795d
-EBUILD linux-firmware-20110604.ebuild 2466 RMD160 8b0a2a910e53816447592fd0ae95ccdfeea142f5 SHA1 b79743de63f6fa3febfa3e7b6f92214f0c6a0469 SHA256 332a69a8b3e1738c2f828e4374365cc58a6e971355d9047b9f3772717160e647
-EBUILD linux-firmware-20110709.ebuild 2471 RMD160 d7276743d33dccf1bf0660469efe5f795cf00a32 SHA1 eab999d80d637123d63327388ea0316ecf0307b6 SHA256 69ff62e4a00a605d57aeadbbb7082668b2044bf3e4c59d75bd40883066e3e4c7
-EBUILD linux-firmware-20110731.ebuild 2496 RMD160 de50857d5bd9fc542eed718a71e4cef6a3017b1a SHA1 f96db0c3907e5a8f4d857cfcd6624b63e34fda22 SHA256 350b4cdc53d56a7f530ea8ea1c4e97ce9d5f8beeba3e6196ad8408fd5317722b
-EBUILD linux-firmware-20110818.ebuild 2501 RMD160 1d5cef8f653a9bba38a7bc182e3bd9de1de9c700 SHA1 167a29f947199315e65ffe9f0a05485c908a5e61 SHA256 c4c26265c6cb3e2a1ba8fc5b3c8be7e06eaf0137ff548a0fe274c313ed8aa8a8
-EBUILD linux-firmware-99999999.ebuild 2486 RMD160 26b9a9a392f28e9f4f7185653a0d1e4c0e47974d SHA1 46185d4b2e97adb41f6b395aa03291af1185626c SHA256 5173bc03bfd032ed2593cb3bc228b3ac733bda31fe97e53eac2bf001dde739eb
-MISC ChangeLog 5283 RMD160 93d2da5810519659ad58ce9db93bc1ded9b62a07 SHA1 854eb9b2bff030d1a9e98db90455b719000c024a SHA256 b01ec454c0fd082d1ffe29e43df1ee119eb1c1b8b038dd99279e2a29b2276839
+EBUILD linux-firmware-20110731.ebuild 2530 RMD160 d40bbff018d65d4c182a51e213a3e3589e104e24 SHA1 8810c34d6e617049d9bbabb91f082597285f9a5b SHA256 46fac00b23062f1d09a28d78e7da5fa6417c2e240c7fefeb374d3186d62c9bb8
+EBUILD linux-firmware-20110818.ebuild 2533 RMD160 98f77dea5b626ddfc7dd453bd9c78db356e5c1f3 SHA1 d294d67e7cf92da6963ad00e59f1e3936d89d767 SHA256 9ecf15661ec1dcb5df70c2f9146ecd01143138cf1e30297c2dd9cb6ce5166116
+EBUILD linux-firmware-99999999.ebuild 2518 RMD160 d927672c2c9922c11ffe368a00037066bcaa1a13 SHA1 46709c617da20aba962cae0ea8808959ebc2d620 SHA256 88cb007157ef7e59e970200858e0439f19196d6e132844a49a6fc3eae2229b2a
+MISC ChangeLog 5583 RMD160 76a90b4e39adebad72b6a51bf6f78fac29c39377 SHA1 09839b4995f07554ef1cf0b7771a14d1cd89ce37 SHA256 63bcb0aeab089677db39a6120118d81bf78dbf816873ed7f5c53d632a81f770c
 MISC metadata.xml 454 RMD160 486442b015182f3a69ac3420ee1fa8af56ca3938 SHA1 c9bbe5d0d641c8545d6f93be32e0fbb4751bc49e SHA256 981ce29c1ab948ee695b585601283674cb5079e054457829d9da06620e199f14
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk5ank4ACgkQkKaRLQcq0GKuEACfTMkenKu3F+inzfC4OWFkTe3T
-kEAAoK87Nookkq22s4wJSwIKebTKlRVl
-=p+Az
------END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110604.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110604.ebuild
deleted file mode 100644
index 335e8f30c176..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20110604.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110604.ebuild,v 1.6 2011/08/07 12:04:15 maekke Exp $
-
-EAPI=3
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git"
-else
-	SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"
-
-LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="amd64 arm x86"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!media-sound/alsa-firmware[alsa_cards_korg1212]
-		!media-sound/alsa-firmware[alsa_cards_maestro3]
-		!media-sound/alsa-firmware[alsa_cards_sb16]
-		!media-sound/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/i2400m-fw
-		!net-wireless/iwl1000-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6050-ucode
-		!net-wireless/libertas-firmware
-		!net-wireless/rt61-firmware
-		!net-wireless/rt73-firmware
-		!sys-block/qla-fc-firmware
-		!x11-drivers/radeon-ucode
-	)"
-#add anything else that collides to this
-
-src_prepare() {
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-	fi
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r * || die "Install failed!"
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110709.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110709.ebuild
deleted file mode 100644
index 829f88f5d496..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20110709.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110709.ebuild,v 1.1 2011/07/20 10:23:35 chithanh Exp $
-
-EAPI=3
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git"
-else
-	SRC_URI="mirror://kernel/linux/kernel/people/dwmw2/firmware/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"
-
-LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!media-sound/alsa-firmware[alsa_cards_korg1212]
-		!media-sound/alsa-firmware[alsa_cards_maestro3]
-		!media-sound/alsa-firmware[alsa_cards_sb16]
-		!media-sound/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!media-tv/ivtv-firmware
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx231xx]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_cx23885]
-		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
-		!net-dialup/ueagle-atm
-		!net-dialup/ueagle4-atm
-		!net-wireless/i2400m-fw
-		!net-wireless/iwl1000-ucode
-		!net-wireless/iwl3945-ucode
-		!net-wireless/iwl4965-ucode
-		!net-wireless/iwl5000-ucode
-		!net-wireless/iwl5150-ucode
-		!net-wireless/iwl6000-ucode
-		!net-wireless/iwl6005-ucode
-		!net-wireless/iwl6050-ucode
-		!net-wireless/libertas-firmware
-		!net-wireless/rt61-firmware
-		!net-wireless/rt73-firmware
-		!sys-block/qla-fc-firmware
-		!x11-drivers/radeon-ucode
-	)"
-#add anything else that collides to this
-
-src_prepare() {
-	echo "# Remove files that shall not be installed from this list." > ${PN}.conf
-	find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf
-
-	if use savedconfig; then
-		restore_config ${PN}.conf
-		ebegin "Removing all files not listed in config"
-		find * \( \! -type d -and \! -name ${PN}.conf \) \
-			| sort ${PN}.conf ${PN}.conf - \
-			| uniq -u | xargs -r rm
-		eend $? || die
-	fi
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r * || die "Install failed!"
-}
-
-pkg_preinst() {
-	if use savedconfig; then
-		ewarn "USE=savedconfig is active. You must handle file collisions manually."
-	fi
-}
-
-pkg_postinst() {
-	elog "If you are only interested in particular firmware files, edit the saved"
-	elog "configfile and remove those that you do not want."
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
index e8552369c9bf..f384f18f0da7 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild,v 1.5 2011/08/28 19:58:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110731.ebuild,v 1.6 2011/11/01 14:40:57 chithanh Exp $
 
 EAPI=3
 inherit savedconfig
@@ -34,6 +34,7 @@ RDEPEND="!savedconfig? (
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
 		!net-dialup/ueagle-atm
 		!net-dialup/ueagle4-atm
+		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
 		!net-wireless/iwl1000-ucode
 		!net-wireless/iwl3945-ucode
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
index 6b6f1cdec35b..1dff65b7a84c 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild,v 1.2 2011/08/23 00:17:16 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20110818.ebuild,v 1.3 2011/11/01 14:40:57 chithanh Exp $
 
 EAPI=3
 inherit savedconfig
@@ -34,6 +34,7 @@ RDEPEND="!savedconfig? (
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
 		!net-dialup/ueagle-atm
 		!net-dialup/ueagle4-atm
+		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
 		!net-wireless/iwl1000-ucode
 		!net-wireless/iwl3945-ucode
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 20b7972208f3..40ae5d09ff8e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.11 2011/08/23 00:17:16 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.12 2011/11/01 14:40:57 chithanh Exp $
 
 EAPI=3
 inherit savedconfig
@@ -34,6 +34,7 @@ RDEPEND="!savedconfig? (
 		!media-tv/linuxtv-dvb-firmware[dvb_cards_usb-dib0700]
 		!net-dialup/ueagle-atm
 		!net-dialup/ueagle4-atm
+		!net-wireless/ar9271-firmware
 		!net-wireless/i2400m-fw
 		!net-wireless/iwl1000-ucode
 		!net-wireless/iwl3945-ucode