version bump that fixes security issues, bug 524390

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB2EFA1D4

9 files changed, 69 insertions, 217 deletions

diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog
index d2ba908da515..cc4347e2fc0a 100644
--- a/x11-misc/sddm/ChangeLog
+++ b/x11-misc/sddm/ChangeLog
@@ -1,6 +1,15 @@
 # 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.12 2014/10/06 22:04:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.13 2014/10/18 17:49:16 jauhien Exp $
+
+*sddm-0.10.0 (18 Oct 2014)
+
+  18 Oct 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  +files/sddm-0.10.0-consolekit.patch, +files/sddm-0.10.0-upower.patch,
+  +sddm-0.10.0.ebuild, -files/sddm-0.1.0-clang.patch,
+  -files/sddm-0.1.0-cmake.patch, -files/sddm-0.1.0-consolekit.patch,
+  -sddm-0.1.0-r2.ebuild, -sddm-0.9.0-r1.ebuild:
+  version bump that fixes security issues, bug 524390
 
   06 Oct 2014; Manuel Rüger <mrueg@gentoo.org> sddm-0.9.0-r1.ebuild:
   Add ~arm keyword. Tested on armv7. See bug #524408.
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 44ff2f03bc8f..59aa6671b1ba 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,11 +1,28 @@
-AUX sddm-0.1.0-clang.patch 2759 SHA256 78c0711149f7f8734476379b75aafcacd0d8bd99494cd61206e1098971cb8a0f SHA512 d7c99e9a46f832b756c5d748853b5726c0d4d075a0c14c86d45fd14c5b0a520f9a3e0352a222079258c2c7701b5227a72d34c73425bdd80c0654e582585d335d WHIRLPOOL ba63c47cd84bcaf1d6f3fbbd24828945c1750e49f485924b9bbb84e4f3f12540646fa47160264718f467555826d51e69934be110d45d1df3f9403a95b1bb8160
-AUX sddm-0.1.0-cmake.patch 1266 SHA256 e34eedffe8d48cd5b3c6c8ae1778e57a4275a3756ae7436f12349403a77303db SHA512 7b9f57d77184a3a81a81f31e3da5d98766edb551376b943a337edd942e9891eb427c3f932ff568ad56096cdec6336f2f5611e0fa86bafd6122c508100486681b WHIRLPOOL c10fd3f106aa262425ba16a784c52fb065605322342c98cb010613605a2cf269b1eccbeca3e291df4ef142d24975d63565ccbb0405576c1be521e7a18d4f2671
-AUX sddm-0.1.0-consolekit.patch 499 SHA256 b46859a705539219102c8ee29e5ae00b5ae8aa1c3f593e94b7d7891531a721d0 SHA512 97f4ade68aabbf46371d445f12d86a0ef40381f8d68d3e1e6bfcf6f53be8bd9b6df0fcb6845ac106f167a2976fec357b203823a64927e0d2859ff34541777d24 WHIRLPOOL d365acebc2bf535d3d8a6f4afbad1b3cbd6dede5b5e8e37f578c376145c04a1c1f401b2171d05057d75f3cc25dc9ad36e7ee017a8c734f9cecf7a3dddb388265
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX sddm-0.10.0-consolekit.patch 429 SHA256 4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5 SHA512 59959087fb31368dad6ee815f90f85d3440abb671a0a10185c1ed1bd8ead5430275ecd9ad16d89c2df55494ee1e1f1412280c0562299bd7a09c7d1af3023d121 WHIRLPOOL 709990539e053d66e2079174945b883ebc7c88a8b8d90a46a4bffa8e3bdbb24a3cc711a95f193045ef151be1993fec688050828039f7c3b54bea99b62c5f322c
+AUX sddm-0.10.0-upower.patch 553 SHA256 6a2efbc0cd65d8f63a3f1288051001b18da5d00f5ce0ddbac1656a69c3a1a29f SHA512 309fcea508b7ec44c15d527277dd895b0bbcb3d118d4fbd97ca02ca7b022c995f5a3434e7a37396ef1ff80574b1dcaf02719b56ad3976242ad82d92fcbfa3db9 WHIRLPOOL e26d2b5df7b6b3983ab43c6f36dbe7a0fe25653605aacc427b7e3eae9a0d2bf1473c56dc745820f897303bde9742212369b69fdfde2a7b2b834db6a14a710700
 AUX sddm-0.9.0-consolekit.patch 429 SHA256 4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5 SHA512 59959087fb31368dad6ee815f90f85d3440abb671a0a10185c1ed1bd8ead5430275ecd9ad16d89c2df55494ee1e1f1412280c0562299bd7a09c7d1af3023d121 WHIRLPOOL 709990539e053d66e2079174945b883ebc7c88a8b8d90a46a4bffa8e3bdbb24a3cc711a95f193045ef151be1993fec688050828039f7c3b54bea99b62c5f322c
 AUX sddm-0.9.0-upower.patch 553 SHA256 6a2efbc0cd65d8f63a3f1288051001b18da5d00f5ce0ddbac1656a69c3a1a29f SHA512 309fcea508b7ec44c15d527277dd895b0bbcb3d118d4fbd97ca02ca7b022c995f5a3434e7a37396ef1ff80574b1dcaf02719b56ad3976242ad82d92fcbfa3db9 WHIRLPOOL e26d2b5df7b6b3983ab43c6f36dbe7a0fe25653605aacc427b7e3eae9a0d2bf1473c56dc745820f897303bde9742212369b69fdfde2a7b2b834db6a14a710700
-DIST sddm-0.1.0.tar.gz 4710358 SHA256 586b87331663d2c389e27fc6cda7cfb83adcd7015aebd1dc683e4adcbe1bfc45 SHA512 b6ea89d9874e5b07f7a00b455cf1362590f0596cf521ebf13d5927b9181c316bbe8fce9d11715f6d1454f905b75681cb681bac4b7f642ffbac29b1b8ca4b6705 WHIRLPOOL d551b0c68a89c70a5255d79905db0676f01585da159819ecace6a394cf32a1c4dc395dc9a145dcfe89d046615cffdc1ef834c8064df3945fe4e647ceb748548a
-DIST sddm-0.9.0.tar.gz 4727609 SHA256 baceaad82b328ed5a46b652ff87fe9b0220c3ff2f46316e282e77fd18dc6189c SHA512 5dc20eb1512c57e2a33c159655097c00333dcf934966f396a78cebd0807fab8b7dbdf4cc41a78c11a3568552c3b8d63df5e7cec4315428bee64e9118500dbb31 WHIRLPOOL 4ae44aa785d4174195531354f1ba30e1abee4393d38c9bb9e01ee5764b8d65bdf2cdb0b3c8cdd9600b83e716f3c20ee694cdc429bf9ca111782243a93be096a7
-EBUILD sddm-0.1.0-r2.ebuild 1670 SHA256 c62e97f4992f2088aa38cd7bfe8457dd269c1242108bd87fd96004f0db7e1740 SHA512 6c069ca014f21af99fe8ab5f38be4b592b80c15d641141b3bbbefb2d4e4f7059475a7c988c079c931e7a4cff23bff8c880542deb4203bccb58c8ec299f0969ee WHIRLPOOL a1b5815ed71612d857d1491da975012c7c3db791a1c3fd15934b64477c5da8438445b6b0617a33e1a24cf14ab3ea9e2343c579d5fde5eaf835f460694c2df1c9
-EBUILD sddm-0.9.0-r1.ebuild 2187 SHA256 b30d6a291b0c5b497b9c2c23aeb54bc248f9a3e1221fa01ec548a9c458c6280c SHA512 82c4b27ab3afe72449dd355053b091e75c5da503a7216eb4c5a7455553cab109d6ece77d4c271139aba5fc8411fd9987bf4ec008c310a4677182cdd25d454db6 WHIRLPOOL 652ed4caf54e0f7f243ad9490cad02d102ed07d136084c8e8b23ddef95c195e4ee5107095ace8f3d6b5d037c458358e7f065bcaf27074df8d97903e95a4abf76
-MISC ChangeLog 2250 SHA256 44b3ec24d0a25e8f03f70811555869f06adae880f8320226bd742f7b108b2cd2 SHA512 650c7118f626974e20c8e24eaa38e2a366abedd9b5862d5e4eb52f512d7680b554f7ca75563e460ed0c1611da00a54a6aa78b2be0cfe589590593297bbceb581 WHIRLPOOL 3962316ec2de2768546c09891e5ee1dca33fef7d3e763b68b4744e0efc683c803430f0992f9993079a5fd9c2aef8c0e234eb4b489c255d21b1655c1e859f607b
+DIST sddm-0.10.0.tar.gz 4727266 SHA256 8d2df745be2025ed3fdaa0065d410c768915e2dddf576eb92eef8ae287319d96 SHA512 c0907c2fe6b2e22f55082fab33c26e62432cb33acf153fa752c0f2bbca2f1d13707c7ca486f77fdfd9c7dd504d29b9c9f8640e59abc184c3130a059c74eb1055 WHIRLPOOL 0f9052e511b1be8bb9f2959df287b648e7d03f23416a30a938620a83cfbd471acd827984fa5e6ec99464da1028311be27ae4f6d1b824a710090537114cc38646
+EBUILD sddm-0.10.0.ebuild 1935 SHA256 ba8a580551494e41a51fff05482eaab004a35d81a7aaf230f382dbd01e78f8e9 SHA512 29dfa8e100b6304ff742cef09d6dc00e4254d5171ddcb328fae92c53bce34e57af2a789eb440e4d94023c71205af2f182032cb382cf9df3b811f697aa7f16a6a WHIRLPOOL 6fe91221c2cedf24a9372689c6e2488f9a7727c3e1bfd8713f599dc27935fb92c5fb4c19a0c411705b4b179716bc3fe0ec8761a9a25dfcc15f294fa5ad40826e
+MISC ChangeLog 2632 SHA256 010f3a56247dc73b6c6a5f6fb95757b163e2e46df9c3510c3c1704561185a080 SHA512 8038e807ed111a69cf785002389f1fa3343b4f7d659019642fda7fcd5529c68558a584dbcc6ff2d4668a253f47c7f3846a61b52d5116a13ade03fddaa341c2ce WHIRLPOOL 000ab2749dcc078f22ddc304c918a46799eab846b933613c47c8cccbb4bd587d738e3a02a782b8c2a371c88ccb305892512695c0ac2ff0f9e4c97e7f452f7cb2
 MISC metadata.xml 684 SHA256 260a9c7c0edd03a2986bee9e483994c9fb135707e9c02340a03c49cfbc2d3f2c SHA512 2cb1389468e2879bab30fcfbb21bc38cf6c35cd7927786cf4293e7775e838a660f488816f1738e6ecb1420b44b8fd1039541614dfe6d2d1d8c629d4a63b1e558 WHIRLPOOL f26b41cbea499725954de851b80f1815b62b6220fa639da5d699a0716a387c279b8a5ea9462a4ef008f407cd777be31859ad43cf77a9c48ab1a0dd6e14fbbee3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUQqglAAoJELvuk32y76HUso4P/A+R057xZyVhkurwPwKRU5GZ
+iVUfV/oK2IL8d4seqRuZf8xbxiv1UUr8AsRiPhbWIiJNJVatXZwG0ob3+Qh/th+R
+DauI96YjZj0C8dw/Z2zvlLBaDQgACwrkS5TzWdvu/wWXkcinarzPz8BpvdoyVOV6
+etUrGkGjK99etCyKaPCoXKzQsACNCeB+HhHuMdbjZcrN2c2ZFbM+jb+/e1f7kmKq
+PscmGPayQpFaM9CHAXEiWy3uogE30BCIP5A+5q8bAMnQYzPdc1XdOHdrTAehIBWV
+0+MyNiwyQhuevHLVWOTeu08gZjY9OIktsRaduUgZLm0iVN4fZ86lu4N7yu72GQzE
+xQqXPsGM6xqUuzz5I7aWW+o2mh76i3WDGVmZiU1CEBRl5VvhPLUxZgpOu/MPnq9r
+o5P0ugmPQIuFMbdMGyAPJcFo08SqKiUPMyYtHMdgFshRmLpgczKXUViMUYzrYWRE
+hP4tVghSHVHfIelPCpaiGc5Q0cgWz3jKh6LMgwyyPfbmBPpJ7id1Bl4l1To+NGRB
+La/HiE/dHrvWYPlnnQVMYdFFyTbegacItrT+H9NOECsnKOdgaECIF7BlEx9fnZaR
+dklYAfG5kZK5MTs1RtIx+axgtR4Cos4UGTp0IeKohHf4adw11p4bQXl4FZX7OdDc
+KnftY/LrRwJeN+0hwmuo
+=L9JD
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/sddm/files/sddm-0.1.0-clang.patch b/x11-misc/sddm/files/sddm-0.1.0-clang.patch
deleted file mode 100644
index 7f0a0e722a14..000000000000
--- a/x11-misc/sddm/files/sddm-0.1.0-clang.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-clang-3.4 and earlier has a bug with intitialization of QStringList with initialization lists
---- src/daemon/Authenticator.cpp
-+++ src/daemon/Authenticator.cpp
-@@ -314,7 +314,7 @@
-         process->setProcessEnvironment(env);
- 
-         // start session
--        process->start(Configuration::instance()->sessionCommand(), { command });
-+        process->start(Configuration::instance()->sessionCommand(), QStringList(command));
- 
-         // connect signal
-         connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished()));
-
---- src/daemon/DisplayServer.cpp
-+++ src/daemon/DisplayServer.cpp
-@@ -60,6 +60,7 @@
-         // log message
-         qDebug() << " DAEMON: Display server starting...";
- 
-+        QStringList start_parameters;
- #if !TEST
-         // set process environment
-         QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-@@ -72,9 +73,11 @@
-         Display *display = qobject_cast<Display *>(parent());
- 
-         // start display server
--        process->start(Configuration::instance()->serverPath(), { m_display, "-auth", m_authPath, "-nolisten", "tcp", QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0')});
-+        start_parameters << m_display << "-auth" << m_authPath << "-nolisten" << "tcp" << QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0');
-+        process->start(Configuration::instance()->serverPath(), start_parameters);
- #else
--        process->start("/usr/bin/Xephyr", { m_display, "-ac", "-br", "-noreset", "-screen",  "800x600"});
-+        start_parameters << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600";
-+        process->start("/usr/bin/Xephyr", start_parameters);
- #endif
-         // wait for display server to start
-         if (!process->waitForStarted()) {
-
---- src/daemon/Greeter.cpp
-+++ src/daemon/Greeter.cpp
-@@ -70,12 +70,15 @@
-         env.insert("XCURSOR_THEME", Configuration::instance()->cursorTheme());
-         process->setProcessEnvironment(env);
- 
-+        QStringList start_parameters;
- #if !TEST
-         // start greeter
--        process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), { "--socket", m_socket, "--theme", m_theme });
-+        start_parameters << "--socket" << m_socket << "--theme" << m_theme;
-+        process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), start_parameters);
- #else
-         // start greeter
--        process->start(QString("%1/sddm-greeter").arg("."), { "--socket", m_socket, "--theme", m_theme });
-+        start_parameters << "--socket" << m_socket << "--theme" << m_theme;
-+        process->start(QString("%1/sddm-greeter").arg("."), start_parameters);
- #endif
-         // wait for greeter to start
-         if (!process->waitForStarted()) {
diff --git a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
deleted file mode 100644
index f0e68ac97247..000000000000
--- a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -6,7 +6,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_AUTOMOC ON)
- 
--add_definitions(-Wall -march=native -std=c++11)
-+add_definitions(-Wall -std=c++11)
- 
- if(NOT CMAKE_BUILD_TYPE)
-         set(CMAKE_BUILD_TYPE Release)
-@@ -19,7 +19,6 @@
- else()
-         message(STATUS "Release build")
-         add_definitions(-DNDEBUG)
--        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
- endif()
- 
- # PKG-CONFIG
-@@ -52,26 +51,26 @@
- 
- add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
- 
-+if(USE_systemd)
- # login1
--pkg_check_modules(LOGIN1 "libsystemd-login")
-+pkg_check_modules(LOGIN1 REQUIRED "libsystemd-login")
- 
--if(LOGIN1_FOUND)
--    # do nothing
- else()
-     set(LOGIN1_FOUND 0)
- endif()
- 
-+if(USE_upower)
- # upower
--pkg_check_modules(UPOWER "upower-glib")
-+pkg_check_modules(UPOWER REQUIRED "upower-glib")
- 
--if(UPOWER_FOUND)
--    # do nothing
- else()
-     set(UPOWER_FOUND 0)
- endif()
- 
-+if(USE_systemd)
- # systemd
--pkg_check_modules(SYSTEMD "systemd")
-+pkg_check_modules(SYSTEMD REQUIRED "systemd")
-+endif()
- 
- if(SYSTEMD_FOUND)
-     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR)
diff --git a/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch
deleted file mode 100644
index a5ac62ac47f8..000000000000
--- a/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- data/scripts/Xsession
-+++ data/scripts/Xsession
-@@ -74,13 +74,13 @@
-     exec xterm -geometry 80x24-0-0
-     ;;
-   custom)
--    exec $HOME/.xsession
-+    exec ck-launch-session $HOME/.xsession
-     ;;
-   default)
--    exec /usr/bin/startkde
-+    exec ck-launch-session /usr/bin/startkde
-     ;;
-   *)
--    eval exec "$session"
-+    eval ck-launch-session "$session"
-     ;;
- esac
- exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch
new file mode 100644
index 000000000000..acdfdc1a43e2
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch
@@ -0,0 +1,13 @@
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index a5d270d..4b48524 100755
+--- a/data/scripts/Xsession
++++ b/data/scripts/Xsession
+@@ -74,7 +74,7 @@ case $session in
+     exec xterm -geometry 80x24-0-0
+     ;;
+   *)
+-    eval exec "$session"
++    eval exec ck-launch-session "$session"
+     ;;
+ esac
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/x11-misc/sddm/files/sddm-0.10.0-upower.patch b/x11-misc/sddm/files/sddm-0.10.0-upower.patch
new file mode 100644
index 000000000000..8c0f34c27e8b
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.10.0-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-0.1.0-r2.ebuild b/x11-misc/sddm/sddm-0.1.0-r2.ebuild
deleted file mode 100644
index a659d7db216e..000000000000
--- a/x11-misc/sddm/sddm-0.1.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-r2.ebuild,v 1.1 2014/10/01 17:20:46 jauhien Exp $
-
-EAPI=5
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
-SLOT="0"
-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/qtdeclarative:4
-	dev-qt/qtdbus:4
-	consolekit? ( sys-auth/consolekit )
-	systemd? ( sys-apps/systemd:= )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.7.0
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-version) < 4.7 ]] && \
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-	fi
-}
-
-src_prepare() {
-	default
-
-	epatch "${FILESDIR}/${P}-cmake.patch" "${FILESDIR}/${P}-clang.patch"
-	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use systemd)
-		$(cmake-utils_use_use upower)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use consolekit; then
-		ewarn "This display manager doesn't have native built-in ConsoleKit support."
-		ewarn "In order to use ConsoleKit pam module with this display manager,"
-		ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so"
-		ewarn "line in /etc/pam.d/system-login"
-	fi
-}
diff --git a/x11-misc/sddm/sddm-0.9.0-r1.ebuild b/x11-misc/sddm/sddm-0.10.0.ebuild
index e88a58636996..7a57840a6d01 100644
--- a/x11-misc/sddm/sddm-0.9.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.10.0.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.9.0-r1.ebuild,v 1.2 2014/10/06 22:04:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.10.0.ebuild,v 1.1 2014/10/18 17:49:16 jauhien Exp $
 
 EAPI=5
 inherit cmake-utils toolchain-funcs user
@@ -8,28 +8,20 @@ inherit cmake-utils toolchain-funcs user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
 SRC_URI="http://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
 SLOT="0"
-IUSE="consolekit +qt4 qt5 systemd +upower"
-REQUIRED_USE="?? ( upower systemd )
-	^^ ( qt4 qt5 )"
+IUSE="consolekit systemd +upower"
+REQUIRED_USE="?? ( upower systemd )"
 
 RDEPEND="sys-libs/pam
-	>=x11-base/xorg-server-1.15.1
 	x11-libs/libxcb[xkb(-)]
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtdeclarative:4
-		dev-qt/qttest:4 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/linguist-tools:5
-		dev-qt/qttest:5 )
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
 	systemd? ( sys-apps/systemd:= )
 	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 DEPEND="${RDEPEND}
@@ -45,7 +37,6 @@ 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||' \
@@ -55,7 +46,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_use qt5 QT5)
 		$(cmake-utils_use_no systemd SYSTEMD)
 	)
 	cmake-utils_src_configure