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

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

6 files changed, 13 insertions, 172 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/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