summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-31 20:47:45 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-31 20:47:45 +0000
commit4dbd4ced43b51fc2dfe10337fe6dea122115cee2 (patch)
tree9f9eddb1712a6146de97e493e9d03eb215952dd2 /x11-misc/sddm
parentAllow falling back to sys-power/upower-pm-utils. (diff)
downloadgentoo-2-4dbd4ced43b51fc2dfe10337fe6dea122115cee2.tar.gz
gentoo-2-4dbd4ced43b51fc2dfe10337fe6dea122115cee2.tar.bz2
gentoo-2-4dbd4ced43b51fc2dfe10337fe6dea122115cee2.zip
Allow falling back to sys-power/upower-pm-utils.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-misc/sddm')
-rw-r--r--x11-misc/sddm/ChangeLog5
-rw-r--r--x11-misc/sddm/sddm-0.1.0-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog
index 9593cf2cdcb1..b061b774bdde 100644
--- a/x11-misc/sddm/ChangeLog
+++ b/x11-misc/sddm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/sddm
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.5 2014/05/26 22:37:38 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.6 2014/05/31 20:47:45 ssuominen Exp $
+
+ 31 May 2014; Samuli Suominen <ssuominen@gentoo.org> sddm-0.1.0-r1.ebuild:
+ Allow falling back to sys-power/upower-pm-utils.
26 May 2014; <jauhien@gentoo.org> -sddm-0.1.0.ebuild,
files/sddm-0.1.0-consolekit.patch, sddm-0.1.0-r1.ebuild:
diff --git a/x11-misc/sddm/sddm-0.1.0-r1.ebuild b/x11-misc/sddm/sddm-0.1.0-r1.ebuild
index cd3630ad31a3..38dd05502340 100644
--- a/x11-misc/sddm/sddm-0.1.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.1.0-r1.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/x11-misc/sddm/sddm-0.1.0-r1.ebuild,v 1.2 2014/05/26 22:37:38 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.1.0-r1.ebuild,v 1.3 2014/05/31 20:47:45 ssuominen Exp $
EAPI=5
inherit cmake-utils toolchain-funcs
@@ -21,7 +21,7 @@ RDEPEND="sys-libs/pam
dev-qt/qtdbus:4
consolekit? ( sys-auth/consolekit )
systemd? ( sys-apps/systemd:= )
- upower? ( sys-power/upower:= )"
+ upower? ( || ( sys-power/upower:= sys-power/upower-pm-utils ) )"
DEPEND="${RDEPEND}
>=sys-devel/gcc-4.7.0
virtual/pkgconfig"