fix ebuild (some fixes were lost during version bump as I used old ebuild)

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

5 files changed, 24 insertions, 44 deletions

diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog
index cc4347e2fc0a..cece85b2169f 100644
--- a/x11-misc/sddm/ChangeLog
+++ b/x11-misc/sddm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.13 2014/10/18 17:49:16 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.14 2014/10/18 17:53:57 jauhien Exp $
+
+  18 Oct 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  -files/sddm-0.9.0-consolekit.patch, -files/sddm-0.9.0-upower.patch,
+  sddm-0.10.0.ebuild:
+  fix ebuild (some fixes were lost during version bump as I used old ebuild)
 
 *sddm-0.10.0 (18 Oct 2014)
 
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 59aa6671b1ba..051d75512580 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -3,26 +3,24 @@ 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.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
+EBUILD sddm-0.10.0.ebuild 2020 SHA256 d36f49b7d6d07cb1e88e32dc9404c7c3e82a37734917d4070cf6858d958ebf54 SHA512 994428982943dc10dae2111236ec09073d5f333f441978d29e16405d6880682f14b3c3b05d8332a7a4e36644d372eeb6a1f4d896bc41270a057577791784d387 WHIRLPOOL 1fdf11e35eb71dc9eed87b29b732defd350de390e83447e455b8c7046d982c297803676ad3a4d17db3569fb634c308b211d7d7af9c240caa20e16d87109c6ea1
+MISC ChangeLog 2856 SHA256 ff4ad79292d8858edcaa27909486e2ae60500790b26d663f6df80681a5477384 SHA512 09f87168fde397f33de16b7ed71d9942dff499890897a40e31e67e6a9977f8001d53242a0d653507dab7bde9226dc2e5887b56e6a8b9b84f5e82f821154e5ddc WHIRLPOOL 9cea9f84121b1c724eeeb8333f2f0d5a3135f959bff1a18bfc9563fd22186da1fc2134ce623c7b5d744f28ae5e923ac32e16eeb1f739bafc1f7a535d206d3657
 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
+iQIcBAEBCAAGBQJUQqk3AAoJELvuk32y76HUYekP/1CY7cmU9o99gxAgYhztollP
+S5aGDCksceyRcWYtfy133fgqekQuqekFcRjnExJy95wDDAwDJYa4YgocqJ7FycTr
+ht6Wvb7eN865AFv0BOoQ06gmDYB1CmxQbs+BPYPyGTt/x8WNYywsFiw6IpGAbt2C
+1rEFhFA0NgnTc1L0NrNay/OgvsNVgOKuKevj8+JxJCrDPUVe/Ck3mXkAaQKxpAOB
+CGoE0+4WIEdok/jBE5+L30eLoVXvadcnfGLcfDClqYgTo0wUVyORlveBTkd8ka6D
+u/Gv2XLy6p9br/IM1wLLn4f29biH1ZqVJbZnIAdhRG2dyOzp1rHWMRqMHSdP5olL
+djtcV/eshzUKKLFtCEwa4Gq6wu64+GE+RLCVnC9lKzISlq4JYwpPbOdjK5lYZkbm
+nWeVzuv4ZDT1VcwRk9BK5rFoP8uEWWKSrU/BuLm0y2yvzKRJJt259MqxagEVccoy
+Q32GSjkX89Embd3ky/Kj5ICRNixAFis5nGPw+bxyJDvuP3pqI8iYzuwvrjVNtAco
+e1KQ1pF4ZfrW2KGZmIqADGcjlm7lxQkdYPgTw9oCmpMWo2zbIXDES98iJChEIYnl
+766FZgwEXJJJU2Qeoag+OsqoD/pQAxPz7f9qHmYLBldQj/GKjmoHmqDaz/fec5WC
+hz24q9vK1vkIITkORhHz
+=Ebxs
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/sddm/files/sddm-0.9.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.9.0-consolekit.patch
deleted file mode 100644
index acdfdc1a43e2..000000000000
--- a/x11-misc/sddm/files/sddm-0.9.0-consolekit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.9.0-upower.patch b/x11-misc/sddm/files/sddm-0.9.0-upower.patch
deleted file mode 100644
index 8c0f34c27e8b..000000000000
--- a/x11-misc/sddm/files/sddm-0.9.0-upower.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.10.0.ebuild b/x11-misc/sddm/sddm-0.10.0.ebuild
index 7a57840a6d01..d266f66d8dbf 100644
--- a/x11-misc/sddm/sddm-0.10.0.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.10.0.ebuild,v 1.1 2014/10/18 17:49:16 jauhien Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.10.0.ebuild,v 1.2 2014/10/18 17:53:57 jauhien Exp $
 
 EAPI=5
 inherit cmake-utils toolchain-funcs user
@@ -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||' \