[kde-base/kdm] Re-add support for session files in /usr/share/xsessions, was dropped accidentally

(Portage version: 2.1.10.7/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

4 files changed, 20 insertions, 20 deletions

diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index e52b640ae13..ea03df56963 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684
@@ -7,24 +7,24 @@ AUX kdm-logrotate 111 RMD160 dfdebb05a456a2a6a83faa86e47ff847618634dd SHA1 af020
 DIST kde-workspace-4.6.95.tar.bz2 20034407 RMD160 8c884ed750383e20233b72c64b72a2c5a1311c78 SHA1 a4ff13d40e16157b98000f8ba1e2ca7b6e18d997 SHA256 eff775f737a8a1d462c373a7affb791ddf0b5bf540d66cbb43c93632be7f144b
 DIST kde-workspace-4.7.0.tar.bz2 20049430 RMD160 20520845b336d9485bb2149191ad9f5e6a90824d SHA1 cbc61a20013c746f424681020c29480c6249fd10 SHA256 7e30d1a493b2b8981790a255edf0003bab19bf4dc3e77c37694da495a33a3468
 EBUILD kdm-4.6.95.ebuild 4112 RMD160 b7f50bc61f5bbc148253552057f7e58a31439eac SHA1 37b62085eb8c1ec263f358609de8a333fb0a8ccf SHA256 ebbfb74a54f77810892df84a5ada89642f4c2637aaca75c5847fa173ebc53c04
-EBUILD kdm-4.7.0.ebuild 4105 RMD160 0db5109f341663cbf27b14a5ac8784a42a1f9131 SHA1 720486240ff4ce4629a5527a6f5bb0bb8e5a05d0 SHA256 ad4b13b967cc4f7a828d7de8ef151b948adddf9371bc58f02183865a7cf658e8
-EBUILD kdm-4.7.49.9999.ebuild 4077 RMD160 b86c133acf590dec78782cb5be7b8879a4017f93 SHA1 ca3b2fe5b141ca7573db39158b8e9723136140b0 SHA256 aaf98faffc0a72f952284ca0f1cedb4da9e23994636cd209e4b690716efbf56d
-EBUILD kdm-9999.ebuild 4077 RMD160 b86c133acf590dec78782cb5be7b8879a4017f93 SHA1 ca3b2fe5b141ca7573db39158b8e9723136140b0 SHA256 aaf98faffc0a72f952284ca0f1cedb4da9e23994636cd209e4b690716efbf56d
+EBUILD kdm-4.7.0.ebuild 4136 RMD160 5618adfea323c69dbdfd8e23216f2317294e40d9 SHA1 82ebdb99efd2846d9160090585198ca203775654 SHA256 90e77867f6888fbbf35a71d50a856f68345497b1c8d74f5a7382ad112319aa63
+EBUILD kdm-4.7.49.9999.ebuild 4108 RMD160 06369422931d87f2e13f5c254100b4319c45c7df SHA1 708fe96f30a1ed4654cbc2cb0e0b8429a1ae3b8b SHA256 99b8fe426aaa22155767a4b3a345ae16c1deeb59caca32e17b9a11e17d18ce6d
+EBUILD kdm-9999.ebuild 4108 RMD160 06369422931d87f2e13f5c254100b4319c45c7df SHA1 708fe96f30a1ed4654cbc2cb0e0b8429a1ae3b8b SHA256 99b8fe426aaa22155767a4b3a345ae16c1deeb59caca32e17b9a11e17d18ce6d
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOKoLOAAoJEC8ZTXQF1qEPgy4P/jUIXe8a+jjWZNDSnNIW9AbO
-+x8uA68m0fAj5VlSm4j4IQyzWv/Tzqe+HEOhLDRTldUtuHdfcbryRZiG5lUhPgsV
-Ru+e1AltyG75hczdhxmp8Bu2Xz4yLDZB45fOGyYhcwYv1KKSu5fSFLL82FDW5Kom
-GfxKmXMYioY/jDT6CrZyHNQljItBibkhkzgbwfmzpzC1PtpiBtEIB9GGFlpP9Duv
-qlNkEIiMuEil3F4Da1JLVH0sUYRVxdHr+g2b5msCiOqHKxgtR2sDnLo0mIDqv9Mn
-akAkOkunt8TxtCfJ91Z+MatFzx9sEP4UN904dCxf2trAqZJ9HbgjXjt8rayJIKkP
-31c9gZMrQqzsGwfhnOyFZuSAJIj2Z+S4rKsYDApvdMiPQFMl5GKY90O9c/ZIhFew
-M2gVSq/Q7aZ/hIzlzYBiUyvLQ7uLmZV8S9lHQQGJceqKta6ok1n2e6ISZPxNCFsU
-L+rlE8CGvOoYQ5R060AiwdTefbgxz0U0Zr8ILiD6fOmt7e0R+Q8noBx3GONqc1Bw
-yXrJ+G8Hwt9ty0/IwyuzSNoLmOu1OcDOv51TGeNaEsI7d5HtlGAd+dr7T/sQhntB
-tPijQzeNyIecJSj0WVXUd3zIjPZGJjkj9tk/2BMu2BHDmcZ06CqQznY3GyVBspDo
-KZT17xx0CuSQQ99aO/Xq
-=dMcq
+iQIcBAEBCgAGBQJOLd8tAAoJENwGBM22xffegXIP/if304AdWHXhKb0HEz7UPQfy
+/2e3U0KBYeKiKuBmuJ96NJYQYn6U9vDIm756EMVjLtuHSR5ZpY7IK/Gvq60LZuZw
+XVK44Ebb7ihm2uqKGCm2YEBZ3mkSK0KhjAJkgW4kuDXD8yAB5wmvylJA48AOBKb+
+415CNfrwAqzzNopsjCOfBLj2YiPAokOBkokE7jd3sJfsZRZWFla45FLToMJZ/bxl
+Rnbf/D61eTA7V+ab278+xW/ykpXNvRVfaLofs38HmOwGYENrh3ALibdg4nKmyciA
+n52IEY0fx7ATQUjd/xQ/k3FOE+Ry+5ANjgg7Er9Que/sPbFcCqbaakzl3ZEvIy4Z
+EmVSvDjMpuR4p7Xt7rHpkf6lmyEf1dZnx4F5Kw9hCmJMbLwVhnb8IxoE98bOZnyE
+PULHciocq0KlZ0e7yOf88x9oE4tbVlkD88B2WKwLxWlZeRWy1nVpXNsNlZ77abun
+m4nz+2+ID7UM1+COI0IMfHxD5k7w8XvYpIcsl9IN+SOSz+xefhjsyYP0FnciDs5D
+Ij0OmPEMpFVIOSKhX6LEG0cb3TR2E7TKJW/zN+DWER9JFD9K3rhm9M1FwFkeNtJw
+sShyO/7n6iKHiQR+2smvmtm8CNEwSwnfpiHMYA2tgguaJk/jSuIyWQUc/hECEdme
+ViTzvmEBIPTrBZsegKvd
+=b4Ok
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-4.7.0.ebuild b/kde-base/kdm/kdm-4.7.0.ebuild
index ea10b413e16..2feb693f585 100644
--- a/kde-base/kdm/kdm-4.7.0.ebuild
+++ b/kde-base/kdm/kdm-4.7.0.ebuild
@@ -78,7 +78,7 @@ src_install() {
 	# - TerminateServer=true to workaround X server regen bug, bug 278473
 	# - DataDir set to /var/lib/kdm
 	# - FaceDir set to /var/lib/kdm/faces
-	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
+	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
 		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
 		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
 		-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
diff --git a/kde-base/kdm/kdm-4.7.49.9999.ebuild b/kde-base/kdm/kdm-4.7.49.9999.ebuild
index f32f4060741..0493bbf2663 100644
--- a/kde-base/kdm/kdm-4.7.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.7.49.9999.ebuild
@@ -78,7 +78,7 @@ src_install() {
 	# - TerminateServer=true to workaround X server regen bug, bug 278473
 	# - DataDir set to /var/lib/kdm
 	# - FaceDir set to /var/lib/kdm/faces
-	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
+	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
 		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
 		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
 		-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index f32f4060741..0493bbf2663 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -78,7 +78,7 @@ src_install() {
 	# - TerminateServer=true to workaround X server regen bug, bug 278473
 	# - DataDir set to /var/lib/kdm
 	# - FaceDir set to /var/lib/kdm/faces
-	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
+	sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
 		-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
 		-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
 		-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \