Add blocker for cpufrequtils as they install the same header

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

3 files changed, 11 insertions, 20 deletions

diff --git a/sys-power/cpupower/ChangeLog b/sys-power/cpupower/ChangeLog
index 01c241b20205..23c221029bec 100644
--- a/sys-power/cpupower/ChangeLog
+++ b/sys-power/cpupower/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/cpupower
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.5 2013/04/23 01:51:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/ChangeLog,v 1.6 2013/04/23 03:23:12 patrick Exp $
+
+  23 Apr 2013; Patrick Lauer <patrick@gentoo.org> cpupower-3.8.ebuild:
+  Add blocker for cpufrequtils as they install the same header
 
   23 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -cpupower-3.8_rc4.ebuild:
   old
@@ -19,4 +22,3 @@
   23 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> +cpupower-3.8_rc4.ebuild:
   This is part of sys-apps/linux-misc-apps but to really replace the old
   cpufreq utils we need this one out. Pending on init script?
-
diff --git a/sys-power/cpupower/Manifest b/sys-power/cpupower/Manifest
index a3e71615b667..e31eb18b1606 100644
--- a/sys-power/cpupower/Manifest
+++ b/sys-power/cpupower/Manifest
@@ -1,20 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX conf.d 224 SHA256 da344b9c7373bfc9a12011caffe2d5a51327a9b0655588d09cc4cae35b5ed2e8 SHA512 552d650fb7dcc5d32a10315639d37eca5bc03318d9d67d1b57def263eff527d5b50d9b4bce039b7851c64f6bc0be82b83edd4da440fca4190a25a37074bbeebe WHIRLPOOL dbb9da5681a07dddb736d25c87efa081517d70fe20904d801f68313fc7d7146369d379ad8f0d7cfcd2d84e4b29351ca6276a3dd1d2d5e313114d4d21ab41ce10
 AUX init.d 778 SHA256 950c0971d16665fbfbe6427224bd432b720dbcb56fbbed63ba36532043405340 SHA512 0cbbddebbf7132ba9debdad4953dc012bae854031406e9506a394bc3fcc35b056524071c89a0fd394070e23f02abd1ee5dce0a29a61a108ce3d9a8f86ce9cf41 WHIRLPOOL 828b9805e82c47133ecc8635640b98a4097647a9f08194fd358068db0ffa89e5dddf4fa1d2bb6f8a5b697c946801771f79f3d8af9cf181f6fa3b63b4322f9542
 DIST linux-3.8.tar.xz 70989468 SHA256 e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b SHA512 10a7983391af907d8aec72bdb096d1cabd4911985715e9ea13d35ff09095c035db15d4ab08b92eda7c10026cc27348cb9728c212335f7fcdcda7c610856ec30f WHIRLPOOL 0c633854ad9c06df1b1d832aea9bbef76144ba88c8fccf6a3f8729101dc36838bcda6ccd444451cab19177608e7f7866f4f79cff1a8ef2bd0c893933d7f1f44c
-EBUILD cpupower-3.8.ebuild 1705 SHA256 2973b732d9b70796e02a40318cd4be211925ec369bddffd32e8ed42cf7aaa27d SHA512 13b32a3175ce46d04a7704caa21a3b655650ce17d06eaa67d303c619d5d203ef27cae20d77b75c6eb8fc5189b8697ec31c9f9cca48d7f4b75c9eb8369fc957c3 WHIRLPOOL 23c83df54870b55fb8b730787f9ed269fcec5b190ccd52da44a7b7335d7c7d19f5013de9d2eb34f5fec1b1308ce38ec7c9cf17ee038b79dac70bbebb12d73cc3
-MISC ChangeLog 921 SHA256 b2569f96a5b965840cff7f3dc647472084fc6de9ca137e0998ed8e76a68236e1 SHA512 5336a91fc6299e5bcaba1de96028470a6c7efe36687926f3d15dd0dc39bd5edde7595b24a2a432de2c85b0782447887687027100210f26631967cb84687aff5d WHIRLPOOL 5e53c60c4bd8bc288895a7b88e4fad7dafb07f6bfd1b7a274632980d5002334248f253f34f4cccaeccc8a184789ed45682962216876af0365cb270ffccb71424
+EBUILD cpupower-3.8.ebuild 1766 SHA256 4bf5fe84229c1cc5100bce9a6bf6d6543e52628d120859c640a0bf2bf50cd601 SHA512 66425f0eccfc01f5da795e403097470ad6646b12dc9c12afc580c6bfcfa596ace376d282a06fd9914dd1d187f567151d4877af74b15e39f039e29a748d87ee7f WHIRLPOOL 479363678fd97cbefbc534dcc40b182d0388110f0a3d6c1fa969bd69e5619573b0db02f92e4a8d0fd2e91d8f06b240172e8fa3b88cd553e0a521329353573efc
+MISC ChangeLog 1053 SHA256 513b8514d4e8f4d55d02e452f9433a789c03eb31ce96c24f93486b6676a94e7a SHA512 cb9ec300c94e0b8eb549004d3878803452470bf4a034942eb2c0a2476a19a7ea5db8436c3b148a793ef653c516afa79fb75a67b6695beb8f399cbc3b0d9acc04 WHIRLPOOL 6517f86cc18020887d8b21a8e43e8129955bf39c3cad00823c20aa30fa1b24e9e773656df563159da7db61475c867870c20c8756c1649bdd828f57c2e471ce8d
 MISC metadata.xml 357 SHA256 be84e27d1bacf98a571c56fea8cd368b79b5304b2f9928516f690f1902a4b535 SHA512 b143b9edb70a97d4c584f771aeb73b5f6895e007c9e4bffdf358f9646ad9520f2e14ca623ea5dd9e4b7bc1b1c5f50e5735c435e9907b43566a1a5f12354f4a1a WHIRLPOOL 5a6fa0c613489f062710fc6ec2633e56e7e7274d962620f1113425544402012459634e223d1e2bc8920acafff46b800a10b4a5422ec8c1a77363c5ab6d61398d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRdel6AAoJEEdUh39IaPFNEbgH/2dZs56vdt26G38ZN2GpfKh/
-lUBlb5UpvPGQaWKRbafxXgrTjAwIfZdMjvUbvox1s4cJ5bi2sAwcJqVFf5Gjlrsn
-EmiM43hKZ8TznK7Y6KXgLvJ/x3nnx3WKurCh4BoOzorLPnwGhVvfWo7igkJhnNEU
-nF1tl9r2WhnstUy+0feA0fmPNoToyM1bEg95ORqVTEvD8olW/FKAF0L/Cx/+AjOS
-TLY/0ZbkbyXv7Kl5Eh+RN2WTU6BLQ7uh9XfNnZbu/PTFxeCd3FaHAGhC8RY4otXV
-RutlxmwZBrZf4BwBqePDimx+xuGpPyOJC/NImJf3glKmZIGp+ep5txhv64XDYGk=
-=Eeih
------END PGP SIGNATURE-----
diff --git a/sys-power/cpupower/cpupower-3.8.ebuild b/sys-power/cpupower/cpupower-3.8.ebuild
index c34d61a1a3e1..96d21f5f1136 100644
--- a/sys-power/cpupower/cpupower-3.8.ebuild
+++ b/sys-power/cpupower/cpupower-3.8.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/sys-power/cpupower/cpupower-3.8.ebuild,v 1.2 2013/04/23 01:54:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpupower/cpupower-3.8.ebuild,v 1.3 2013/04/23 03:23:12 patrick Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs
@@ -19,8 +19,11 @@ IUSE="cpufreq_bench debug nls"
 # there in favour of this one which i'll push to users are replacement
 # for the dead cpufreq tools in tree
 # !sys-apps/linux-misc-apps[cpupower]
+
+# header collision with cpufrequtils
 RDEPEND="sys-apps/pciutils
-	!sys-apps/linux-misc-apps"
+	!sys-apps/linux-misc-apps
+	!sys-power/cpufrequtils"
 DEPEND="${RDEPEND}
 	virtual/os-headers
 	nls? ( sys-devel/gettext )"