diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-04-08 11:11:47 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-04-08 11:11:47 +0000 |
| commit | bffd4fd7c7d2ea81322eef63b2f52ad5567df323 (patch) | |
| tree | 8e45bb99f7f23dfee6fda0b56c879eb6171f158e /sys-power | |
| parent | Version bump. (diff) | |
| download | gentoo-2-bffd4fd7c7d2ea81322eef63b2f52ad5567df323.tar.gz gentoo-2-bffd4fd7c7d2ea81322eef63b2f52ad5567df323.tar.bz2 gentoo-2-bffd4fd7c7d2ea81322eef63b2f52ad5567df323.zip | |
Adjust linux-misc-apps blockers.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-power')
| -rw-r--r-- | sys-power/cpupower/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-power/cpupower/cpupower-3.13.ebuild | 4 | ||||
| -rw-r--r-- | sys-power/cpupower/cpupower-3.14.ebuild | 4 |
3 files changed, 9 insertions, 5 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/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 |