diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 10:09:22 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 10:09:22 +0000 |
| commit | ec1732a6865f9788f03200f4443121bb5883a4e1 (patch) | |
| tree | ee276d5d16ba9262ba12e853aee113544363c083 /sys-power/pm-utils | |
| parent | Don't install conflicting pm-utils hooks wrt #327443. (diff) | |
| download | gentoo-2-ec1732a6865f9788f03200f4443121bb5883a4e1.tar.gz gentoo-2-ec1732a6865f9788f03200f4443121bb5883a4e1.tar.bz2 gentoo-2-ec1732a6865f9788f03200f4443121bb5883a4e1.zip | |
Block only conflicting laptop-mode-tools wrt #327443.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-power/pm-utils')
| -rw-r--r-- | sys-power/pm-utils/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-power/pm-utils/pm-utils-1.4.1.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog index 25fbd4b37ce9..60b48829dc58 100644 --- a/sys-power/pm-utils/ChangeLog +++ b/sys-power/pm-utils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-power/pm-utils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.49 2010/07/08 07:39:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.50 2010/07/08 10:09:22 ssuominen Exp $ + + 08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.1.ebuild: + Block only conflicting laptop-mode-tools wrt #327443. 08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.1.ebuild: Don't block sys-power/powermgmt-base anymore if USE="pm-utils" is enabled diff --git a/sys-power/pm-utils/pm-utils-1.4.1.ebuild b/sys-power/pm-utils/pm-utils-1.4.1.ebuild index 960ecaed91be..65e7b7321187 100644 --- a/sys-power/pm-utils/pm-utils-1.4.1.ebuild +++ b/sys-power/pm-utils/pm-utils-1.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.1.ebuild,v 1.3 2010/07/08 07:39:31 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.1.ebuild,v 1.4 2010/07/08 10:09:22 ssuominen Exp $ EAPI=2 inherit multilib @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon" vbetool="!video_cards_intel? ( sys-apps/vbetool )" -DEPEND="!app-laptop/laptop-mode-tools +DEPEND="!<app-laptop/laptop-mode-tools-1.55-r1 !<sys-power/powermgmt-base-1.31 !>=sys-power/powermgmt-base-1.31[-pm-utils]" RDEPEND="${DEPEND} |