New snapshot, bug #498000. Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 12 insertions, 213 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index 7c4efd50b8c7..2d3d73f6c70c 100644
--- a/sys-kernel/linux-firmware/ChangeLog
+++ b/sys-kernel/linux-firmware/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/linux-firmware
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.89 2014/01/15 09:21:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.90 2014/01/18 16:33:56 chithanh Exp $
+
+*linux-firmware-20131230 (18 Jan 2014)
+
+  18 Jan 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +linux-firmware-20131230.ebuild, -linux-firmware-20130421.ebuild,
+  -linux-firmware-20130530.ebuild, -linux-firmware-20130711.ebuild:
+  New snapshot, bug #498000. Remove old.
 
   15 Jan 2014; Agostino Sarubbo <ago@gentoo.org> linux-firmware-20130728.ebuild:
   Stable for ia64, wrt bug #485376
diff --git a/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild b/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild
deleted file mode 100644
index 8348e965a82f..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130530.ebuild,v 1.3 2013/06/24 13:21:08 zerochaos Exp $
-
-EAPI=5
-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"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-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"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-		!sys-firmware/alsa-firmware[alsa_cards_sb16]
-		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!<sys-firmware/ivtv-firmware-20080701-r1
-		!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
-		!sys-firmware/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/iwl2000-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-20130711.ebuild b/sys-kernel/linux-firmware/linux-firmware-20130711.ebuild
deleted file mode 100644
index 234c3b5d7043..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20130711.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130711.ebuild,v 1.1 2013/07/17 02:25:53 zerochaos Exp $
-
-EAPI=5
-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"
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-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"
-SLOT="0"
-IUSE="savedconfig"
-
-DEPEND=""
-RDEPEND="!savedconfig? (
-		!sys-firmware/alsa-firmware[alsa_cards_ca0132]
-		!sys-firmware/alsa-firmware[alsa_cards_korg1212]
-		!sys-firmware/alsa-firmware[alsa_cards_maestro3]
-		!sys-firmware/alsa-firmware[alsa_cards_sb16]
-		!sys-firmware/alsa-firmware[alsa_cards_ymfpci]
-		!media-tv/cx18-firmware
-		!<sys-firmware/ivtv-firmware-20080701-r1
-		!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
-		!sys-firmware/rt61-firmware
-		!net-wireless/rt73-firmware
-		!net-wireless/rt2860-firmware
-		!net-wireless/rt2870-firmware
-		!sys-block/qla-fc-firmware
-		!sys-firmware/amd-ucode
-		!sys-firmware/iwl1000-ucode
-		!sys-firmware/iwl2000-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 #am I the only one that makes these manually?
-	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-20130421.ebuild b/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild
index 18babd785c19..29d330ce740b 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20130421.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20130421.ebuild,v 1.13 2013/06/26 12:00:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-20131230.ebuild,v 1.1 2014/01/18 16:33:56 chithanh Exp $
 
 EAPI=5
 inherit savedconfig
@@ -12,7 +12,7 @@ if [[ ${PV} == 99999999* ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux firmware files"
@@ -44,6 +44,7 @@ RDEPEND="!savedconfig? (
 		!net-wireless/rt2860-firmware
 		!net-wireless/rt2870-firmware
 		!sys-block/qla-fc-firmware
+		!sys-firmware/amd-ucode
 		!sys-firmware/iwl1000-ucode
 		!sys-firmware/iwl2000-ucode
 		!sys-firmware/iwl2030-ucode