New snapshot. Add more blockers, bug #274343. Unify live and snaphot ebuilds.

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

4 files changed, 96 insertions, 13 deletions

diff --git a/sys-kernel/linux-firmware/ChangeLog b/sys-kernel/linux-firmware/ChangeLog
index 2e0cb0876155..d7f0cebc8c87 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.6 2010/10/20 18:24:47 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/ChangeLog,v 1.7 2011/02/19 20:30:46 chithanh Exp $
+
+*linux-firmware-20110128 (19 Feb 2011)
+
+  19 Feb 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +linux-firmware-20110128.ebuild, linux-firmware-99999999.ebuild:
+  New snapshot. Add more blockers, bug #274343. Unify live and snaphot
+  ebuilds.
 
 *linux-firmware-20100930 (20 Oct 2010)
 
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 67f2541aca84..c02b8c80c499 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,7 +1,9 @@
 DIST linux-firmware-20090421.tar.bz2 4419117 RMD160 4eb474907ed3e38982462fe8df18711239c2f2e5 SHA1 650b6c548b69ddace298e94971db9254ed3e89b7 SHA256 382c6291c7b2dd881ea1d8f0b3ad33f5f35159b2ee4da0ec890c8a8a289274da
 DIST linux-firmware-20100930.tar.bz2 10872245 RMD160 92a70cbf95469e4443a496f554ae569c022bf6a6 SHA1 38b814cfc7f922b1cbe755307af688cd8003d347 SHA256 8e123dea916938b074fe8180b570b94afd2d48f8e2f8e399be3425ee8f0fde7f
+DIST linux-firmware-20110128.tar.bz2 12004175 RMD160 57ef40e81cc7276c92196de8749e545911ebffad SHA1 a2de5c37c1dda506736a08e27b0a73127c723b70 SHA256 842f380efd74969623876b3420ae671b08b02b98c94e64e105068a6b5028b20e
 EBUILD linux-firmware-20090421.ebuild 627 RMD160 8cf754b221d60e0a480772b10331399ee05801bb SHA1 bdb7b6f7f60fad1bffeda340019f4041a9cbcb7e SHA256 1cacf6c4b254b73e7f68140b2c3591454138b787fc22e16be46479ee53c77ff3
 EBUILD linux-firmware-20100930.ebuild 558 RMD160 f2d8a3e77941f0f4506ce7375e3bf602efe81b62 SHA1 95db574a50a3083abe30c7f603457137d78dbe1f SHA256 b1b7f29ec864913fe4afe1a060e65c6fc38bd9e44db7d55fa71147d3273a0fc3
-EBUILD linux-firmware-99999999.ebuild 771 RMD160 27d2317e4550129e1a9a31bd1c9aa28c60fd7a3f SHA1 2eb804d31fa988e3e2ccd39e784fd0403e174e2a SHA256 4c7ac283727965d2ef6cd118c38d758b7aa1b783c5ba7a5f9c4cad0657691a82
-MISC ChangeLog 1277 RMD160 acabfac6ca131ab7d69a21c702f9660ccb69bb14 SHA1 60238fe43cb0c962c7b31c1818bb47bd1e1425b4 SHA256 4c39800e73224388ee5fbabe0b75aca9fceb84ae86744ca26e06312a732896e9
+EBUILD linux-firmware-20110128.ebuild 1547 RMD160 95d386437e8dd1359c252103b3c8bbb65138c126 SHA1 1296df726238a65eb8f0cc5bd4f03a64ea271fb6 SHA256 b8773be73815f11b1ef6949d2e213e1d7ec418b1a957b59e7b7845a52fe486d8
+EBUILD linux-firmware-99999999.ebuild 1536 RMD160 0f901c62b9465de7976079b7717e6e7f94c243f5 SHA1 99fa7787d982ace4b5809ad58e0af8d3308089e0 SHA256 032af6978197f46639f68917d5948fcc1854ebccfa47ef28cceb541326ef1d87
+MISC ChangeLog 1535 RMD160 66f53a8a2e06d1432efe056f6896eb19f8967b08 SHA1 e749d1f13eb902a12dc40692be600fe5857a0b15 SHA256 278da205789280fd5fc4b629c87da04c4ecd6bcf2d1be2d5d42cd29ef38c3919
 MISC metadata.xml 253 RMD160 e7d67595772b3d216ee7df5ddcfc44ec593de81c SHA1 814e59cac069bf55b6221bce39f4f831493b6ee6 SHA256 50865a07dab85c706d604493e4ceda9f8347c89952dfadd1ea500f78864338bc
diff --git a/sys-kernel/linux-firmware/linux-firmware-20110128.ebuild b/sys-kernel/linux-firmware/linux-firmware-20110128.ebuild
new file mode 100644
index 000000000000..c991193dfc7f
--- /dev/null
+++ b/sys-kernel/linux-firmware/linux-firmware-20110128.ebuild
@@ -0,0 +1,50 @@
+# 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-20110128.ebuild,v 1.1 2011/02/19 20:30:46 chithanh Exp $
+
+EAPI=3
+
+DESCRIPTION="Linux firmware files"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git
+	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
+
+LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!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/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-wireless/libertas-firmware
+	!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/iwl6050-ucode
+	!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_install() {
+	insinto /lib/firmware/
+	doins -r * || die "Install failed!"
+}
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 28d6d6e64284..f99a508affb9 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -1,23 +1,47 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.4 2010/05/07 18:18:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.5 2011/02/19 20:30:46 chithanh Exp $
 
-inherit git
+EAPI=3
 
 DESCRIPTION="Linux firmware files"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware"
-SRC_URI=""
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/${PN}.git"
+
+if [[ ${PV} == 99999999* ]]; then
+	inherit git
+	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
 
 LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist"
-SLOT="0"
 KEYWORDS=""
+SLOT="0"
+IUSE=""
 
 DEPEND=""
-RDEPEND="!net-wireless/iwl3945-ucode
-	!net-wireless/ralink-firmware
+RDEPEND="!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/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-wireless/libertas-firmware
+	!net-wireless/i2400m-fw
+	!net-wireless/iwl1000-ucode
+	!net-wireless/iwl3945-ucode
 	!net-wireless/iwl4965-ucode
-	!net-wireless/iwl5000-ucode"
+	!net-wireless/iwl5000-ucode
+	!net-wireless/iwl5150-ucode
+	!net-wireless/iwl6000-ucode
+	!net-wireless/iwl6050-ucode
+	!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_install() {