From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 8 Jul 2010 07:39:31 +0000 (+0000)
Subject: Don't block sys-power/powermgmt-base anymore if USE="pm-utils" is enabled wrt #255249.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=735d631d4ca2390738670307e7d36006dcb2b2c8;p=gentoo.git

Don't block sys-power/powermgmt-base anymore if USE="pm-utils" is enabled wrt #255249.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/sys-power/pm-utils/ChangeLog b/sys-power/pm-utils/ChangeLog
index 1160fbb59d22..25fbd4b37ce9 100644
--- a/sys-power/pm-utils/ChangeLog
+++ b/sys-power/pm-utils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.48 2010/07/08 02:54:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/pm-utils/ChangeLog,v 1.49 2010/07/08 07:39:31 ssuominen Exp $
+
+  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
+  wrt #255249.
 
 *pm-utils-1.4.1 (08 Jul 2010)
 
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 979324ac6c47..960ecaed91be 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.2 2010/07/08 02:55:18 ssuominen Exp $
+# $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 $
 
 EAPI=2
 inherit multilib
@@ -16,7 +16,8 @@ IUSE="alsa debug networkmanager ntp video_cards_intel video_cards_radeon"
 
 vbetool="!video_cards_intel? ( sys-apps/vbetool )"
 DEPEND="!app-laptop/laptop-mode-tools
-	!sys-power/powermgmt-base"
+	!<sys-power/powermgmt-base-1.31
+	!>=sys-power/powermgmt-base-1.31[-pm-utils]"
 RDEPEND="${DEPEND}
 	sys-apps/dbus
 	>=sys-apps/util-linux-2.13