diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 01:40:16 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-08 01:40:16 +0000 |
| commit | 926f93c00dfbfb0d6288b4ef3049b27e51a101ec (patch) | |
| tree | 1d08e05ca76d139b1c4d14d6a19a4d8cdb01902d /sys-power/pm-utils | |
| parent | ppc64 stable wrt #319969 (diff) | |
| download | gentoo-2-926f93c00dfbfb0d6288b4ef3049b27e51a101ec.tar.gz gentoo-2-926f93c00dfbfb0d6288b4ef3049b27e51a101ec.tar.bz2 gentoo-2-926f93c00dfbfb0d6288b4ef3049b27e51a101ec.zip | |
Block app-laptop/laptop-mode-tools wrt upstream ChangeLog; "Update git tree packaging to conflict with laptop-mode-tools. The new powermanagement scripts conflict with laptop-mode-tools. Make sure both are not installed at the same time."
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-power/pm-utils')
| -rw-r--r-- | sys-power/pm-utils/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-power/pm-utils/pm-utils-1.4.0.ebuild | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog index a6bac9f2c2bb..65c8fa5f7fe1 100644 --- a/sys-power/pm-utils/ChangeLog +++ b/sys-power/pm-utils/ChangeLog @@ -1,6 +1,12 @@ # 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.46 2010/07/03 21:32:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.47 2010/07/08 01:40:16 ssuominen Exp $ + + 08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.4.0.ebuild: + Block app-laptop/laptop-mode-tools wrt upstream ChangeLog; "Update git + tree packaging to conflict with laptop-mode-tools. The new powermanagement + scripts conflict with laptop-mode-tools. Make sure both are not installed + at the same time." 03 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pm-utils-1.3.0-r2.ebuild: diff --git a/sys-power/pm-utils/pm-utils-1.4.0.ebuild b/sys-power/pm-utils/pm-utils-1.4.0.ebuild index 3cb64f1f4d16..359316e3c6b8 100644 --- a/sys-power/pm-utils/pm-utils-1.4.0.ebuild +++ b/sys-power/pm-utils/pm-utils-1.4.0.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.0.ebuild,v 1.2 2010/06/23 11:06:33 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/pm-utils-1.4.0.ebuild,v 1.3 2010/07/08 01:40:16 ssuominen Exp $ EAPI=2 inherit autotools multilib @@ -15,8 +15,9 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon" vbetool="!video_cards_intel? ( sys-apps/vbetool )" -RDEPEND=" - !sys-power/powermgmt-base +DEPEND="!app-laptop/laptop-mode-tools + !sys-power/powermgmt-base" +RDEPEND="${DEPEND} sys-apps/dbus >=sys-apps/util-linux-2.13 sys-power/pm-quirks @@ -26,7 +27,6 @@ RDEPEND=" amd64? ( ${vbetool} ) x86? ( ${vbetool} ) video_cards_radeon? ( app-laptop/radeontool )" -DEPEND="" src_prepare() { local ignore="01grub" |