Adjust linux-misc-apps blockers.

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

4 files changed, 19 insertions, 15 deletions

diff --git a/sys-power/cpupower/ChangeLog b/sys-power/cpupower/ChangeLog
index d5698de645ed..91015407bb77 100644
--- a/sys-power/cpupower/ChangeLog
+++ b/sys-power/cpupower/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/cpupower
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.16 2014/04/08 11:05:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.17 2014/04/08 11:11:47 ssuominen Exp $
+
+  08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> cpupower-3.13.ebuild,
+  cpupower-3.14.ebuild:
+  Adjust linux-misc-apps blockers.
 
 *cpupower-3.14 (08 Apr 2014)
 
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index 32ee4f845e32..f8de9ea29817 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -5,18 +5,18 @@ AUX conf.d-r2 1616 SHA256 9ab6f022d2b2948660decf5e383984e6ddb9e9e5e6e2761c303137
 AUX init.d-r4 915 SHA256 25f2a1665c88dc5227698bdedc2098d6e37d12d8b966f00e2a180c95a33cc8b4 SHA512 ade36fae595eead5e4108661b2ee999040b8498dc345d862a218242b895bcfc1bfcc05a087de984ecd37b80d6554635ae3d24b893b2586e8e7269c75e9c02afc WHIRLPOOL a1fc7ac2c828f57c9363e8e3eac5cdb6c3514a67335a8b1d806b8b222e9afa5c8d765908aa33a4a0cfbee82584f10745ccaa87707bcc74ca3a8efcad5d9b741e
 DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
-EBUILD cpupower-3.13.ebuild 1565 SHA256 58612206d680d78b08e0db6352219e60dbda7c29597eb4dd301522ada0fe8381 SHA512 5450629275e19ab177b8dc3efed264deacf06a41c15113a6e9fdbf4b390d5ef3fd38c13d3f764716246382677bcac1ba38bb5a3d09eadff5fc0d9a6ff93e33fb WHIRLPOOL f5802e6cb6321472a57c06005fef3283ed4efa2091cbe072df1f66cc2b710d7a1c717cf468bac5a4621ba34817c0e1a84c2502387a4496a6c1b3c030221e8639
-EBUILD cpupower-3.14.ebuild 1567 SHA256 cbf9000b662f0535b5422f12c36c028dc78a011838db4e0cf9bc85fcad936783 SHA512 a4b94b8919929245454fb1026359463c56aed6766dc86267596b180038c42994390e33add1c69b9a1b704b2f7bd2d7f7a3f0199f45f8e1800b54032244047539 WHIRLPOOL 65c95f993f9f41531f8973a72f30fe21e073e765dce99bb6097d92144d0facc8a11490bae4c1d70d669d3d5f1f234447fc0931c99f8fc0472990ff208103712a
-MISC ChangeLog 2809 SHA256 0336d99d5e81a3224a39261fd69638a84a91dcf78d8f17ad69afc1e830a9b992 SHA512 4084d307161763df9b4f099ea27a299f83cd2f98ebab4ed4910c120e27182506d7e84658ef6d7ad235d310566daa55bae693f6e7756a454b4df01fe859912425 WHIRLPOOL e47aec7a2b0f681a2cfd6bddcebd7acd660d55b5e298e2822ff32ecdddffcc900ffd0fb2a4215f70c0775883a6e7c48994619d7df633618814bdb23b61e6f7e7
+EBUILD cpupower-3.13.ebuild 1573 SHA256 873fda1ebb4d576aac20803f243b7a90065a37f0ad50e0645013c68149acc508 SHA512 4c337d37651dd1ffb213c36c5f5c8840fef735f05e293483a0a55e5bce9a51c6f7fbf2b59a583c742a4c0c88f49bfdc429f6184c4161ba70fa2c3f6054c7bb6c WHIRLPOOL 0f676a24db80683ccc968dc34076b01f70ea4d6f06c86d425b090e6f851945082a9f7659f47dcec827c7a55bfe533335617aad61b6a3fbef3f1801d124467c37
+EBUILD cpupower-3.14.ebuild 1575 SHA256 63fe57f154c0df43116f84f1187fdf22d1efaf04950d0a8e45b33d2c39534c2a SHA512 aba58cd475ebb56f03957822fe1545882cb82e61163963b40ede9fda9696b9fb4a5e7e4204fe3160df32617847ca86630c6ad39ff5715253396f809debabcd88 WHIRLPOOL 921ff4df81040dec65fb267dd1fe349833461d4b28b055ccb46b5e2882cbec2d0acb00d76c33ca00768f65230f8bb306cd3a0da72d1c8022a05b10853a4fd3ea
+MISC ChangeLog 2945 SHA256 303fb7838461cb81f3c7947168129a83b32f437a90f1eb61c4abc6593719ad21 SHA512 faff76af4b9b5c88e0856e26b30e5db28693f8359123ae0b96e2e373239138a892dca5846515f9ce6645de6e3287f32757a9b4d1be7ef3762046b045b64f1d9a WHIRLPOOL e6c12553e02e7cec57d81e9beab16d76afafa86d2a0066b9753d75e7d9606632176cacafe414d8c6e960475b7d27ff2a83d57e66247574a72e87089910642765
 MISC metadata.xml 357 SHA256 be84e27d1bacf98a571c56fea8cd368b79b5304b2f9928516f690f1902a4b535 SHA512 b143b9edb70a97d4c584f771aeb73b5f6895e007c9e4bffdf358f9646ad9520f2e14ca623ea5dd9e4b7bc1b1c5f50e5735c435e9907b43566a1a5f12354f4a1a WHIRLPOOL 5a6fa0c613489f062710fc6ec2633e56e7e7274d962620f1113425544402012459634e223d1e2bc8920acafff46b800a10b4a5422ec8c1a77363c5ab6d61398d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTQ9apAAoJEEdUh39IaPFNVu0H/jkXBOjDGjV3+qyC37E/Cfqe
-D3luHURGYUXxOlW1WdLYKXbkMGJ+gxrMy8Fg30NOjVNypExr+fx5gxP2cAe9VLiN
-OP0ZQdI9ZHUWglp8r85M/3eCqFeSb+efdkm+RIUK6a7ZNWmueBRnvmhTsauH3Uyv
-lRnY2uouQ4ac+X3bZG4A5NGhuZczjKXVheICyKqRMc77Aqqx4YmUh2x9H0QLXCv0
-HnT8A7CZDyp8ORvqhz7Zo3Xb3RBaBCJF+bq5+gASqar+sE2BoF9niHoqIq+s/QGv
-+Ue6co6AYv6S98sszFWLHz4+KZYx0QOzZSh4a7pWMnY28UMV6+e4Yv9C7gAj380=
-=+9dv
+iQEcBAEBCAAGBQJTQ9gNAAoJEEdUh39IaPFNjtYH/01ECzb7lXmr7LO1qVTaUxoX
+GqoAAp0zLJJUu3twxrYwdQ9DNGTEb3TH341BQS75Ws1MCe/3y5oh5XlA06IBc+9U
+PCgm0rkubeGuvTO/F/Zr7/DOO7TVDaOC5Yq+Hqq/P9ZoNjD76hQCloP8AygfKTu7
+kLn/PCGt+iAQckodKetJfj7TahHCNSoPeN2MaCNesBIcjhe/7E9oBv7Q47JD8dyi
+pEN+nGJcyMFfGp4fKsF0w2tsZu3hxanxPzJEw/1VWijqmaKGgX+++R5zw8v/w6K0
+q4lerkfE3KMX8UKE8zeo1aXEa0xziUDwja7hkSJOMpNRKO6MXzm234oya7Rzl0A=
+=a2xc
 -----END PGP SIGNATURE-----
diff --git a/sys-power/cpupower/cpupower-3.13.ebuild b/sys-power/cpupower/cpupower-3.13.ebuild
index b2c630d2a4ce..4a8c33d69c13 100644
--- a/sys-power/cpupower/cpupower-3.13.ebuild
+++ b/sys-power/cpupower/cpupower-3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/cpupower-3.13.ebuild,v 1.2 2014/02/18 07:33:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/cpupower-3.13.ebuild,v 1.3 2014/04/08 11:11:47 ssuominen Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs
@@ -16,7 +16,7 @@ IUSE="cpufreq_bench debug nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
 RDEPEND="sys-apps/pciutils
-	!sys-apps/linux-misc-apps
+	!<sys-apps/linux-misc-apps-3.6-r2
 	!sys-power/cpufrequtils"
 DEPEND="${RDEPEND}
 	virtual/os-headers
diff --git a/sys-power/cpupower/cpupower-3.14.ebuild b/sys-power/cpupower/cpupower-3.14.ebuild
index 8a47b4a06f84..c41c5c092251 100644
--- a/sys-power/cpupower/cpupower-3.14.ebuild
+++ b/sys-power/cpupower/cpupower-3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/cpupower-3.14.ebuild,v 1.1 2014/04/08 11:05:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/cpupower-3.14.ebuild,v 1.2 2014/04/08 11:11:47 ssuominen Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs
@@ -16,7 +16,7 @@ IUSE="cpufreq_bench debug nls"
 
 # File collision w/ headers of the deprecated cpufrequtils
 RDEPEND="sys-apps/pciutils
-	!sys-apps/linux-misc-apps
+	!<sys-apps/linux-misc-apps-3.6-r2
 	!sys-power/cpufrequtils"
 DEPEND="${RDEPEND}
 	virtual/os-headers