Block sys-kernel/linux-firmware wrt #468712

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 29 insertions, 18 deletions

diff --git a/media-sound/alsa-headers/ChangeLog b/media-sound/alsa-headers/ChangeLog
index 5d831e3e0118..eb7da01a52ba 100644
--- a/media-sound/alsa-headers/ChangeLog
+++ b/media-sound/alsa-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-headers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.223 2013/05/06 14:25:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.224 2013/07/15 14:16:15 ssuominen Exp $
+
+  15 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
+  alsa-headers-1.0.25.ebuild, alsa-headers-1.0.25-r1.ebuild,
+  alsa-headers-9999.ebuild:
+  Block sys-kernel/linux-firmware wrt #468712
 
   06 May 2013; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Orphan alsa-headers as it's unrequired wrt #468712#c4
diff --git a/media-sound/alsa-headers/Manifest b/media-sound/alsa-headers/Manifest
index fbcd281600d5..cf00d94416ca 100644
--- a/media-sound/alsa-headers/Manifest
+++ b/media-sound/alsa-headers/Manifest
@@ -3,19 +3,19 @@ Hash: SHA256
 
 AUX alsa-headers-1.0.6a-user.patch 192 SHA256 3f7b80d552851b528b62298c1e60d678fc33ba0ed642661d68d7c58e1db0edfd SHA512 7adcbb9efac7fa72f0d53a222dc8be1023546a2a9a370a9da4ff3c11007d86249b72d3fef716ed55913d67cd47113311cbdb429a17f229bf0200d105dc6174fd WHIRLPOOL 4e2e238510df499fc9b1b3c4b3d9e624baf12efaa04cac8fa10fd0b23aec23553bbc84364b02b6e255605c36574820dfd23b8533a361ebdf89c7333b6f0b8c90
 DIST alsa-driver-1.0.25.tar.bz2 3861484 SHA256 d80e219fd410b5bc62f9332e5964acd575cc8a0bcda80fa41d5eebeabde0ebc3 SHA512 51164c5f1c6e40e188be8e544ddc610b56ffb7d696bc925a0a30e6819d6cbd90a7f9f33c379d411d0e7a172a3ed1cf15b59c27654d63db1a9bad2051331d3017 WHIRLPOOL b70a3614baf72cc2762a2b8a65e07af0204c8550aa140aa01f7d5ee998a8cdf54f43600cfb61c2cb4773d55813afd9aef845f4219d955fbf0f3bc085cf003c7d
-EBUILD alsa-headers-1.0.25-r1.ebuild 1279 SHA256 ef73fd2201069044a1a7621816e6dc12bae861358df1e7946c258e7155048308 SHA512 017e791cf696e16c08bf7c29ff7a17f1b318c018775ba2e94c86c8061f1387722aaf5a5593ced2af808e09e686be5f7f65191f9926bd3d28bbf262d564a82088 WHIRLPOOL 409878e3aa6bbcf3ef32989908c24a737cbe7420bdb047e94817a05099e14112ee005bbca7b3f31f67b199ebd01aa4afd8dc46c1cc2ccf3cb4f83c2d5402b4ac
-EBUILD alsa-headers-1.0.25.ebuild 1045 SHA256 4c90c56e7100ee65a41160b9ce0af9d2ee01cf863ea4bfaa5c76fbe69cb44bb4 SHA512 12bb957e703829b314bdace8cfd992b81a8d326322c5041b05cc9808de33f2bf7af10dc313c7b279964f7f2c252b958363fa134bc2a3d24919e192dd1d759342 WHIRLPOOL 387c06b8444c366abf6c822f96bafc528e4806d600eafaeaff5784de59ac3209be94be754b1bf2691e9dafd597a659c808a7285dc1878d5e994e8074d3059ab6
-EBUILD alsa-headers-9999.ebuild 1252 SHA256 694b045a79ee285c0f2e1b96a1d25a071e795d92842a5d5460973e29005c5aa8 SHA512 9df39f1d2d5f1e471a54b95a5457ab8ec3c96dd8064295c303e23e3431afb6297591e55b73f5c4e3df968e5acf6f084c21bf80d2841d806e86d3c3c5bbd62dc4 WHIRLPOOL a51c175e9b412529065b7fa6a5ec8319a260a5a6e78e78f84c7a06b88f5607a1c68e2f8ef6ec6560a77d160fd50a1b40f4775fd2a97787c81cd85a370e793f0b
-MISC ChangeLog 29528 SHA256 bb7f541e4ff7ea98866182856529ebb6a5f008d316e5a9bbfa6c0d8b153b7d28 SHA512 9701886b2610165e525b66074036dee6a961342676b9a51856acc7ae1513b468d9a2d60fd68539cc7110dda70138fd6ea62f7cfd00203e616a4d2e0d5de358c2 WHIRLPOOL e96979833601337e4f10460f78e15700001fc6eacee410ed91b841baf556a084ca69bcf3090c029a4d566a1dc89a492dec70ced9a218ecff383ca41acf15c067
+EBUILD alsa-headers-1.0.25-r1.ebuild 1337 SHA256 2dce6beb7b8ebbe8f64e38142e6dc8874666a20fbfcc72a74da7e28f33f71503 SHA512 15ae487c0eeeae0e74feac14f82cfd054e8ee13bd7c50695f60bfdce8fc619c5ca9013adcfa6c9b24699bde1d58f0d2695f2ce67543c0069658eba6ecfcd2caa WHIRLPOOL a71eea836fb8c596ffaaa6c6ab07258d4143f13762d1eda5cbe43c2343e319fcade589c754dd4a7b81153ed22d45e56fc3467cbabf9f077602d46e2fe71f3a9e
+EBUILD alsa-headers-1.0.25.ebuild 1087 SHA256 2958cac7c3e57c6b75f8534ab9e26ae1ee14953027b66a64ea19907b7af6542a SHA512 da1866563a3f51c9923878f97c4be681b1652ba6ee9887c157dca3ee2a01de6acdbb4eabcad59393a7f49ccb823244c6d102eeae5ab0b303a7eeb56d800330e8 WHIRLPOOL 91cfbe28ef26cc64cc625de38a28ec52baea65b9b4ecb31594bfaa2fe594f45e89b54005395723de11dba677b330931810323234487b493f60d4a45904c9011d
+EBUILD alsa-headers-9999.ebuild 1310 SHA256 5e96c801699285c526e4211167e2b3609d2e08c89338e167c0a7faf99df0ec7f SHA512 0d55d1cef6137a398e0c9f934d7af2ec2dcb798e87b92328ad3ce80eef83c43f0d1183182ebcb8b3fc4b6c5fb97783cc20f930681cb0e78a87d174e8813a7e35 WHIRLPOOL a496bd4715417ac0f085544d0d9791e47e91f908c940b4dec45519c6a5694d832a5b0c7f4ee45d3d927394f273cdc6bb662305b4537cf7bf6896abeda20c53af
+MISC ChangeLog 29718 SHA256 da06c169ca85fd81d1c58125d43eeef0bf55c6f472ae2dd616b0bdab97b3ec75 SHA512 715a81cf9571728c014ebc1fae0f73c1bd329c16e4913e903c88c7fbccdc2ea4af9a4275020194cd661d70a18ffec7bcd20bf0d4fa03f24f7d4221dc99890ba3 WHIRLPOOL f59be37f27d7a17f411eccf9d156bf69b76114b441299368a1a384e9cfa2afa5b85f26d35db1f6e883d2aa3c41be2b1fc54c93873db665e00e64dcbd151c56d1
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRh70wAAoJEEdUh39IaPFN+6QIAJYHDWLQsbk0ZW9cykjPjMHp
-Q9hmwh8m7GYVDqK3BpBHNsVIMUrgBIgvJHqd/WDSGcNFh0gk2q8aRww5AKejGHO5
-CbY+LbsJ7Hh5oSK7ska+R8fZk7gxlINb6ieH1zNmY8caUCaB8fWojYgWFLgE2zm7
-dQnLGUjiXBIlNMp1S0KAjoapC9npEb9t35YVKhn9zESzbGCdusvTYYYRgsPa1WOs
-I/FQHcg+EbHsGUL8GqgFc4I/b8TBpGPB71INMngYFdfUch2+/XzDr2jmMTdzYBx6
-WeP0tF8mlv5AoGwNEBLOfVYoi01uFTWiVerNRL38RZrw9py2ZddSlxGGuwDF/JY=
-=mSAn
+iQEcBAEBCAAGBQJR5AQrAAoJEEdUh39IaPFNgbYH/RD5OxCdsq/+Isgp3ThEXnfA
+PVmDYWUiKMkzV64xT0IDXmSspAxqapeVK8By+fIRzeIr597328IEK4W99hCEacu8
+QUuLnFFoUPGTOXL8E3IxGDP80BVQiHt7ETI78ZqkDKkiPK3xp5LTHoZwT5/Us7Vs
+ugAG9bG86oV7rAlzA0SK1wHFZB0OSXUSJH+SXr2NNoS2wh1iCPuqPvs8/VWaTDfR
+Rcm6m9F3ZGII8Xe2RDs/5wUydUlSjtmfjqu+SCeMmVsKtmjg+OPN+feR32EQSA8s
+Nwcx78flpjfw9fbEllGUBdRy7zvnb/033HRxqzexN4FWPhzaZ5HCKeyYAbaNVwg=
+=FgK0
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild
index eaeb056ce884..3bebd12fa270 100644
--- a/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild,v 1.1 2013/04/16 04:09:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.25-r1.ebuild,v 1.2 2013/07/15 14:16:15 ssuominen Exp $
 
 EAPI=5
 
@@ -24,6 +24,9 @@ IUSE=""
 
 RESTRICT="binchecks strip"
 
+RDEPEND="!sys-kernel/linux-firmware"
+DEPEND="${RDEPEND}"
+
 EGIT_REPO_URI="git://git.alsa-project.org/alsa-kmirror.git
 	http://git.alsa-project.org/http/alsa-kmirror.git"
 
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild
index 27b940ddf367..36ae3e712381 100644
--- a/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild,v 1.8 2013/03/13 10:57:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.25.ebuild,v 1.9 2013/07/15 14:16:15 ssuominen Exp $
 
 EAPI="4"
 
@@ -19,8 +19,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+RDEPEND="!sys-kernel/linux-firmware"
+DEPEND="${RDEPEND}"
 
 RESTRICT="binchecks strip"
 
diff --git a/media-sound/alsa-headers/alsa-headers-9999.ebuild b/media-sound/alsa-headers/alsa-headers-9999.ebuild
index e44b719408f4..e60a6edae9e4 100644
--- a/media-sound/alsa-headers/alsa-headers-9999.ebuild
+++ b/media-sound/alsa-headers/alsa-headers-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-9999.ebuild,v 1.10 2013/04/16 04:13:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-9999.ebuild,v 1.11 2013/07/15 14:16:15 ssuominen Exp $
 
 EAPI=5
 
@@ -24,6 +24,9 @@ IUSE=""
 
 RESTRICT="binchecks strip"
 
+RDEPEND="!sys-kernel/linux-firmware"
+DEPEND="${RDEPEND}"
+
 EGIT_REPO_URI="git://git.alsa-project.org/alsa-kmirror.git
 	http://git.alsa-project.org/http/alsa-kmirror.git"