New snapshot. Remove old. Block iwl2000-ucode.

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

8 files changed, 20 insertions, 208 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index a036309cdc28..74aef84fad58 100644
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/linux-firmware
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.53 2012/09/18 07:58:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.54 2012/10/03 20:45:59 chithanh Exp $
+
+*linux-firmware-20120924 (03 Oct 2012)
+
+  03 Oct 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +linux-firmware-20120924.ebuild, -linux-firmware-20120502.ebuild,
+  -linux-firmware-20120615.ebuild, -linux-firmware-20120708.ebuild,
+  linux-firmware-20120719.ebuild, linux-firmware-20120816.ebuild,
+  linux-firmware-20120909.ebuild, linux-firmware-99999999.ebuild:
+  New snapshot. Remove old. Block iwl2000-ucode.
 
   18 Sep 2012; Johannes Huber <johu@gentoo.org> linux-firmware-20120719.ebuild:
   Stable for x86, wrt bug #433006
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
deleted file mode 100644
index 914aea20a7be..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120502.ebuild,v 1.8 2012/08/18 20:15:52 ulm Exp $
-
-EAPI=4
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="amd64 arm ~ia64 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/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/libertas-firmware
-		!net-wireless/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!sys-firmware/iwl1000-ucode
-		!sys-firmware/iwl2030-ucode
-		!sys-firmware/iwl3945-ucode
-		!sys-firmware/iwl4965-ucode
-		!sys-firmware/iwl5000-ucode
-		!sys-firmware/iwl5150-ucode
-		!sys-firmware/iwl6000-ucode
-		!sys-firmware/iwl6005-ucode
-		!sys-firmware/iwl6030-ucode
-		!sys-firmware/iwl6050-ucode
-		!x11-drivers/radeon-ucode
-	)"
-#add anything else that collides to this
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-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
-		# remove empty directories, bug #396073
-		find -type d -empty -delete || die
-	fi
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r *
-}
-
-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-20120708.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild
deleted file mode 100644
index b19c7c2a8568..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120708.ebuild,v 1.3 2012/08/18 20:15:52 ulm Exp $
-
-EAPI=4
-inherit savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-KEYWORDS="~amd64 ~arm ~ia64 ~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/ar9271-firmware
-		!net-wireless/i2400m-fw
-		!net-wireless/libertas-firmware
-		!net-wireless/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!sys-firmware/iwl1000-ucode
-		!sys-firmware/iwl2030-ucode
-		!sys-firmware/iwl3945-ucode
-		!sys-firmware/iwl4965-ucode
-		!sys-firmware/iwl5000-ucode
-		!sys-firmware/iwl5150-ucode
-		!sys-firmware/iwl6000-ucode
-		!sys-firmware/iwl6005-ucode
-		!sys-firmware/iwl6030-ucode
-		!sys-firmware/iwl6050-ucode
-		!x11-drivers/radeon-ucode
-	)"
-#add anything else that collides to this
-
-src_unpack() {
-	if [[ ${PV} == 99999999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		# rename directory from git snapshot tarball
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-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
-		# remove empty directories, bug #396073
-		find -type d -empty -delete || die
-	fi
-}
-
-src_install() {
-	save_config ${PN}.conf
-	rm ${PN}.conf || die
-	insinto /lib/firmware/
-	doins -r *
-}
-
-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-20120719.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild
index 91d82dcffcba..03c4bd5fd9ba 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild,v 1.6 2012/09/18 07:58:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120719.ebuild,v 1.7 2012/10/03 20:45:59 chithanh Exp $
 
 EAPI=4
 inherit savedconfig
@@ -43,6 +43,7 @@ RDEPEND="!savedconfig? (
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
 		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
 		!sys-firmware/iwl2030-ucode
 		!sys-firmware/iwl3945-ucode
 		!sys-firmware/iwl4965-ucode
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild
index 9fd104a6650b..08a99a751ba4 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild,v 1.1 2012/08/27 21:44:08 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120816.ebuild,v 1.2 2012/10/03 20:45:59 chithanh Exp $
 
 EAPI=4
 inherit savedconfig
@@ -43,6 +43,7 @@ RDEPEND="!savedconfig? (
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
 		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
 		!sys-firmware/iwl2030-ucode
 		!sys-firmware/iwl3945-ucode
 		!sys-firmware/iwl4965-ucode
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild
index c77032b483ae..406dbf15bd20 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild,v 1.1 2012/09/16 21:01:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120909.ebuild,v 1.2 2012/10/03 20:45:59 chithanh Exp $
 
 EAPI=4
 inherit savedconfig
@@ -43,6 +43,7 @@ RDEPEND="!savedconfig? (
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
 		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
 		!sys-firmware/iwl2030-ucode
 		!sys-firmware/iwl3945-ucode
 		!sys-firmware/iwl4965-ucode
diff --git a/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild b/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild
index 492b1514d21e..219503dd3cd8 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120615.ebuild,v 1.3 2012/08/18 20:15:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20120924.ebuild,v 1.1 2012/10/03 20:45:59 chithanh Exp $
 
 EAPI=4
 inherit savedconfig
@@ -43,6 +43,7 @@ RDEPEND="!savedconfig? (
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
 		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
 		!sys-firmware/iwl2030-ucode
 		!sys-firmware/iwl3945-ucode
 		!sys-firmware/iwl4965-ucode
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 8ee844afaeb2..59d4341ad00f 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-2012 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.19 2012/08/18 20:15:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.20 2012/10/03 20:45:59 chithanh Exp $
 
 EAPI=4
 inherit savedconfig
@@ -43,6 +43,7 @@ RDEPEND="!savedconfig? (
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
 		!sys-firmware/iwl1000-ucode
+		!sys-firmware/iwl2000-ucode
 		!sys-firmware/iwl2030-ucode
 		!sys-firmware/iwl3945-ucode
 		!sys-firmware/iwl4965-ucode