summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-05-31 20:31:33 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-05-31 20:31:33 +0000
commit1e4e9defe0b843afc094455507283bcb6557f50c (patch)
tree6854554bdb445827b17b378927810abf43809d70 /kde-misc/synaptiks
parentAllow falling back to sys-power/upower-pm-utils. This change was committed to... (diff)
downloadgentoo-2-1e4e9defe0b843afc094455507283bcb6557f50c.tar.gz
gentoo-2-1e4e9defe0b843afc094455507283bcb6557f50c.tar.bz2
gentoo-2-1e4e9defe0b843afc094455507283bcb6557f50c.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 'kde-misc/synaptiks')
-rw-r--r--kde-misc/synaptiks/ChangeLog6
-rw-r--r--kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild9
-rw-r--r--kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild4
3 files changed, 13 insertions, 6 deletions
diff --git a/kde-misc/synaptiks/ChangeLog b/kde-misc/synaptiks/ChangeLog
index 601c73b8774f..e7d10c079ec4 100644
--- a/kde-misc/synaptiks/ChangeLog
+++ b/kde-misc/synaptiks/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-misc/synaptiks
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.45 2014/03/14 06:24:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/ChangeLog,v 1.46 2014/05/31 20:31:33 ssuominen Exp $
+
+ 31 May 2014; Samuli Suominen <ssuominen@gentoo.org> synaptiks-0.8.1-r2.ebuild,
+ synaptiks-0.8.1-r4.ebuild:
+ Allow falling back to sys-power/upower-pm-utils.
14 Mar 2014; Michael Palimaka <kensington@gentoo.org>
synaptiks-0.8.1-r4.ebuild:
diff --git a/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild b/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild
index 100f9e6125b5..dd3133c88e04 100644
--- a/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild
+++ b/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild,v 1.4 2013/12/15 16:52:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.8.1-r2.ebuild,v 1.5 2014/05/31 20:31:33 ssuominen Exp $
EAPI=5
PYTHON_DEPEND="2:2.6"
@@ -27,7 +27,10 @@ RDEPEND="
>=x11-drivers/xf86-input-synaptics-1.3
>=x11-libs/libXi-1.4
x11-libs/libXtst
- upower? ( dev-python/dbus-python sys-power/upower )"
+ upower? (
+ dev-python/dbus-python
+ || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
+ )"
DEPEND="${RDEPEND}
app-text/docbook-xsl-stylesheets
sys-devel/gettext
diff --git a/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild b/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild
index 9717c381a0b0..62387f0926c0 100644
--- a/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild
+++ b/kde-misc/synaptiks/synaptiks-0.8.1-r4.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/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild,v 1.3 2014/03/14 06:24:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/synaptiks/synaptiks-0.8.1-r4.ebuild,v 1.4 2014/05/31 20:31:33 ssuominen Exp $
EAPI=5
@@ -29,7 +29,7 @@ RDEPEND="
x11-libs/libXtst
upower? (
dev-python/dbus-python[${PYTHON_USEDEP}]
- sys-power/upower
+ || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )
)
"
DEPEND="${RDEPEND}