[gentoo-commits] proj/qt:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

[Davide Pesavento]

commit:     3543e0ac77a51f975e1c6175f2a64d2eacacd404
Author:     Jauhien Piatlicki <jpiatlicki <AT> zertisa <DOT> com>
AuthorDate: Sat Oct 18 18:12:53 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct 18 18:12:53 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3543e0ac

[x11-misc/sddm] sync with tree: fix bug 524072 and temporary fix bug 523630

---
 x11-misc/sddm/files/sddm-9999-upower.patch | 12 ++++++++++++
 x11-misc/sddm/sddm-9999.ebuild             |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-9999-upower.patch 
b/x11-misc/sddm/files/sddm-9999-upower.patch
new file mode 100644
index 0000000..8c0f34c
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-9999-upower.patch
@@ -0,0 +1,12 @@
+diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp 
sddm-0.9.0/src/daemon/PowerManager.cpp
+--- sddm-0.9.0.orig/src/daemon/PowerManager.cpp        2014-10-01 
18:40:37.402683578 +0200
++++ sddm-0.9.0/src/daemon/PowerManager.cpp     2014-10-01 18:40:43.502618164 
+0200
+@@ -197,7 +197,7 @@
+             m_backends << new Login1Backend();
+ 
+         // check if upower interface exists
+-        if (interface->isServiceRegistered(UPOWER_SERVICE))
++//        if (interface->isServiceRegistered(UPOWER_SERVICE))
+             m_backends << new UPowerBackend();
+     }
+ 

diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index 548297a..48ba4c8 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -16,6 +16,7 @@ IUSE="consolekit systemd +upower"
 REQUIRED_USE="?? ( upower systemd )"
 
 RDEPEND="sys-libs/pam
+       >=x11-base/xorg-server-1.15.1
        x11-libs/libxcb[xkb(-)]
        dev-qt/qtcore:5
        dev-qt/qtdbus:5
@@ -37,6 +38,7 @@ pkg_pretend() {
 
 src_prepare() {
        use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
+       use upower && epatch "${FILESDIR}/${P}-upower.patch"
 
        # respect user's cflags
        sed -e 's|-Wall -march=native||' \