fix bug 552318

Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0xB2EFA1D4

4 files changed, 81 insertions, 4 deletions

diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog
index 68b15ab88cf5..8061ec80c755 100644
--- a/x11-misc/sddm/ChangeLog
+++ b/x11-misc/sddm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/sddm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.17 2015/06/22 10:47:52 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.18 2015/06/28 13:52:08 jauhien Exp $
+
+*sddm-0.11.0-r1 (28 Jun 2015)
+
+  28 Jun 2015; Jauhien Piatlicki <jauhien@gentoo.org>
+  +files/sddm-0.11.0-dbus-config.patch, +sddm-0.11.0-r1.ebuild,
+  -sddm-0.11.0.ebuild:
+  fix bug 552318
 
   22 Jun 2015; Manuel Rüger <mrueg@gentoo.org> -sddm-0.10.0.ebuild:
   Remove old.
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index e25e14e662d0..0b0c1c5acdbd 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,7 +1,28 @@
+-----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.11.0-consolekit.patch 395 SHA256 28da5f7183d24120e65271a540f6f222ddaa4544c00e860f9c598526718adb4c SHA512 d47c0243bee6c4119ec0a3f9e7ffce8b7fdb18a46513b621d2a9752431dd5c3379ad9e12431fac107322488807cc8fd61a5ce5db3a8f8ef4d5b4ac8abd731905 WHIRLPOOL c8eb05c278468e5f8cd9acfb9d1dd50a560215c315667a282ddba23eef5d2a8b79b841eeaf2157b301cf4e8697115cff92913038164c60c251975ae5d7231dac
+AUX sddm-0.11.0-dbus-config.patch 2240 SHA256 6d4bf5df7c98f5193cd3574cd48c5b22930f51dbafd22b56015224bf38913412 SHA512 ad8f1a92f843daf1666610a2560be96a869a41509e62e9114a41fcb2c72654bf513f6a0b901ec262959d319df25307bf54900ce5ba074397c0ec38ba3cc616ef WHIRLPOOL 2981ad47be4cc384dbb77c6a694f061d8e535874bef73899596f45748f2a0e0d69e1ef2ef96a8895eed5e50281528bb1eb6c0a4becba9d552f71683ed019aa85
 DIST sddm-0.11.0.tar.gz 4735807 SHA256 80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce SHA512 9dd2b80788e3cfdb353e64f709db451e04828991976b8b0f74c0e97dbf467fa2744702c73e5e50137eec10dac92df7dacd83fb458f75dd595556fc95fb1759f7 WHIRLPOOL 079c5093374710c2a3247a3e27dd26f3d10962c7cb8f260b80a4ba17a72e63676012d4b8e50f8f4bffc43124efdf05c7e14aefe86253b391345c7fa98a2d4c2f
-EBUILD sddm-0.11.0.ebuild 2033 SHA256 01bc49f309ceab0f47b98a9c6f3df70b3dae2ac9b9c7178e0116d7698135e6c9 SHA512 728c3fd82ecd02439ffe6e77818f047f4820cde7042f57b519e95ebc8910aca2678a4c82d681cc3294580f170b94c2f81c4ebba42f83dc5956c8a693f366718d WHIRLPOOL 7315fb7ef8a6768190adab162e28007463677ef6bd47768479b0578ad5062bab48e5c5629cd78d966fedf93d841afc19b9eae30ba59dc7b8b12c1b3be5bf8568
-MISC ChangeLog 3199 SHA256 0d28d9c0e09e4b703379ce7012e15e212b6243ced8dc53648c3765efa411ef7c SHA512 7c98453db9b710f985f6da000516216e6b30e8cb704adbe0f86915bee2476e5b022ad601dce1b650bfc7ae9a3d60e564ebb7869a3e56adb963f5812257c0a765 WHIRLPOOL c5806b1ddba08d94b2c313433570b84dc919274cf1c331d4c8b9b391b8f8daf49499c4be90c60104e8de79fe12286032f16af2bf588c0ae7a67f6930aaa37bc3
+EBUILD sddm-0.11.0-r1.ebuild 2159 SHA256 d635a04f486a6be790602b5a647f65cc9eb6a74197583222687443c3bce78ce1 SHA512 7417ae2d54c3bf6b8b62d6b8faf1628c3aef70140e531ba2ff70211eedc21d78eadad40a3494b61fa93be261d2b88a29f7e2277efc0a8232175ef06fce2f598e WHIRLPOOL dfdd7ebeca3d31a3d19937bb658fbccec85c3c67ea3c36908e7a240a008daca61eb14c1cf541545169afb4df18c2b51600c2a7eae722a782239aab0db5a9b372
+MISC ChangeLog 3391 SHA256 3512268a5a75b764800ce67e516270f4482390a1f9ab958ec0627dc4403889e8 SHA512 3ec070987205570ba6efa11b7feca3fa42a96d2ae4997dab21c713eab043c883d9f6b7073c8572314fc6793374a6061dfa9c0eba812de21de7869c284e5b3a6d WHIRLPOOL 440c4354b7e61f5022f1f728d3a1346b8cea88eeeade570f9b3ba83a67faf26987e532e5566f272df49d3af30c7fc745983273b1cb8733625690e5fa1a6776a1
 MISC metadata.xml 762 SHA256 04f7ac016bf0a81ddd81d0dd28a2796d9e44e7111030154404d510e3098ae854 SHA512 a2db26e3847457ebb41de648436313f901451022bc973b6cd0245eaa05f0f6e271eab69f19b9711cbad51b8c58272f48eb66a9772e8d1daff3567b704fc26681 WHIRLPOOL a16bc6b0adb397c09b98f6fe01dfeff66eaa2ad53de0b79eaf1c889f0a28bd6dff7086e55985975545939305d0cf6b48d08ff4a9a2aad14e6de042db5200cc9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVj/xuAAoJELvuk32y76HUG1wP/30EMJWCb1+4viXpUADRgxTV
+3zXqmeejrH2vVqXV/LinwuVIubj9XOi3xQiddozbZu7ZR6DN/+517p21PXdT6PVu
+rSkpWHFY+jDby1AH7UxO1uH8taSuaA+4jy4fG7ri4ZAabMq7U+q5EIahVxRV1nla
+wXTJeuniGXIGiQRc52COc4e+lFzJG1Gpoj080E3ZtYlTWN6DNoRUIgNdreG0eEIB
+ME5bIqkrg4/psrJJuvQucBRgc0h5z0mzbdLDnmYEZc1HlOTKkkRJwcgEZqJ3xyyg
+HuQpFzghdmucAaCYDfIeEVRN9w+I2h24VCSjmIyLaZalBBNYTWNPoaNKmclbcO+c
+s/vBAJZX+xnjBwsfknG5+Z1Zfrq4nwwWQGihqrCSkOQzSSBupfPD+CLIOagsTg5o
+5+L3xkcxSw7cvtaPgK5r8Pp7arFoS+swoc/heX0oW520fYa2QcjqelN1eoiVSGxt
+cjbG01n2+2LqI7BB/amZ1f+JXijx7lr39grJv+O6Ge5FyacedkmCkSQ0r4xw4JAZ
+z3ttpC6wyuwPyZH2ECotzlqQxRAUbOD1ezmOiN+d4bInp5PwEpTLz34YxzO8UloE
+cnToHgoyiOA82N9/2T1f3Q3aiLg5mbV1M2MSWnCzKQYrGeBh4rCKXyD3L5RmnCCA
+s4Sbus3bAPyrCo+gJf6L
+=s2+Q
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch b/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch
new file mode 100644
index 000000000000..c13c2bd79cf4
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.11.0-dbus-config.patch
@@ -0,0 +1,46 @@
+From 4ab6ab1b78617c51a6d9db4d03be2b3d75e7acc5 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Tue, 14 Apr 2015 10:50:00 +0200
+Subject: [PATCH] allow changing the dbus config file name
+
+on some distributions the generic name of the dbus config might be provided
+by more than one display manager, so always installing with the generic
+name would require distributions to hard-patch the cmake code.
+allowing to change it through a cmake cache variable enables distributions
+to simply parameterize in their cmake call.
+
+this for example affects Ubuntu where the config would be provided by both
+SDDM and LightDM.
+---
+ CMakeLists.txt      | 1 +
+ data/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ceed6e..cf21dc9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -141,6 +141,7 @@ set(SESSION_COMMAND             "${DATA_INSTALL_DIR}/scripts/Xsession"
+ 
+ set(CONFIG_FILE                 "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf"        CACHE PATH      "Path of the sddm config file")
+ set(LOG_FILE                    "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log"  CACHE PATH      "Path of the sddm log file")
++set(DBUS_CONFIG_FILENAME        "org.freedesktop.DisplayManager.conf"               CACHE STRING    "Name of the sddm config file")
+ set(COMPONENTS_TRANSLATION_DIR  "${DATA_INSTALL_DIR}/translations"                  CACHE PATH      "Components translations directory")
+ 
+ # Add subdirectories
+diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
+index 918892f..335f4e7 100644
+--- a/data/CMakeLists.txt
++++ b/data/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ install(DIRECTORY   "faces"                             DESTINATION "${DATA_INSTALL_DIR}")
+ install(DIRECTORY   "flags"                             DESTINATION "${DATA_INSTALL_DIR}")
+ 
+-install(FILES "org.freedesktop.DisplayManager.conf"       DESTINATION "${DBUS_CONFIG_DIR}")
++install(FILES "org.freedesktop.DisplayManager.conf"     DESTINATION "${DBUS_CONFIG_DIR}" RENAME ${DBUS_CONFIG_FILENAME})
+ 
+ install(FILES "scripts/Xsession" "scripts/Xsetup" "scripts/Xstop" DESTINATION "${DATA_INSTALL_DIR}/scripts"
+         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+-- 
+2.3.6
+
diff --git a/x11-misc/sddm/sddm-0.11.0.ebuild b/x11-misc/sddm/sddm-0.11.0-r1.ebuild
index fbfabe4e5420..2f5712765fa6 100644
--- a/x11-misc/sddm/sddm-0.11.0.ebuild
+++ b/x11-misc/sddm/sddm-0.11.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.11.0.ebuild,v 1.2 2015/02/02 19:33:50 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.11.0-r1.ebuild,v 1.1 2015/06/28 13:52:08 jauhien Exp $
 
 EAPI=5
 inherit cmake-utils toolchain-funcs user
@@ -39,6 +39,8 @@ pkg_pretend() {
 src_prepare() {
 	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
 	use upower && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
+	# fix bug 552318
+	epatch "${FILESDIR}/${P}-dbus-config.patch"
 
 	# respect user's cflags
 	sed -e 's|-Wall -march=native||' \
@@ -49,6 +51,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_no systemd SYSTEMD)
+		-DDBUS_CONFIG_FILENAME:STRING="org.freedesktop.sddm.conf"
 	)
 	cmake-utils_src_configure
 }