diff options
| -rw-r--r-- | sys-power/cpupower/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/cpupower/cpupower-3.8.ebuild | 7 |
2 files changed, 9 insertions, 4 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/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 )" |