Merge branch 'gdm'

Conflicts:
	sys-apps/systemd-units/Manifest

4 files changed, 20 insertions, 14 deletions

diff --git a/sys-apps/systemd-units/Manifest b/sys-apps/systemd-units/Manifest
index 45c469c..bec2aae 100644
--- a/sys-apps/systemd-units/Manifest
+++ b/sys-apps/systemd-units/Manifest
@@ -4,7 +4,7 @@ AUX services-basic/syslog-ng.service 150 RMD160 322a68be82f21735248f02cedf67021b
 AUX services-basic/syslog-ng.socket 102 RMD160 b25f2e2fd86b0ff23201e8f910a03f149ad4824a SHA1 d4ee7f84d3268b406a8003eb52037c0cd8abf960 SHA256 7dc9ab3dc6d592b43f1f6121839315b5b138ad6fb511f2740fb67669e3dcc187
 AUX services-basic/vixie-cron.service 158 RMD160 5135b058277a8c68e89fad06ac5096c8f95acaf9 SHA1 ec4cd323d1404ac10f72819d56cf565e75eff084 SHA256 54c27aef74a98ad7a2c74456b4e8aa933ae13aa9ee7ac2dbffabc449a7c95b3d
 AUX services-desktop/dhcpcd.service 130 RMD160 8d0070798217d0c8027f3f12dfdb9fdbc3783626 SHA1 aa186200bcf66befc685d31a37fa6c05e12298a0 SHA256 fc6ba30569049e225156b99ea7f8661cd9a8427d59886d7595daaa26288efa7c
-AUX services-desktop/gdm.service 211 RMD160 2c39671e41da74dd18265eac13ca4bc956b73de0 SHA1 c9299b4537d8701df1824537b3e5f08da1b58c7d SHA256 df5b03ff0c52978c44cc01eeb338ef310c129d599c78fe4ef56506238a39cf2f
+AUX services-desktop/gdm@.service 249 RMD160 518e692742336f7f2d2bd4b0d2f73fd0aa4c7bd2 SHA1 dba2a5b1e6c4e2b3e9e8879bc0926a28f5ee6eba SHA256 fbc77d9aa6e0dd1631244d3fe4663e09f4078cad2ab71c0c12b7077e67f7fd91
 AUX services-desktop/hald.service 209 RMD160 a82a68ec5406835e77124428e5f9bb624b458e86 SHA1 02d507bf0102c72553fea7e95e7763a5e7e629e9 SHA256 9cc914dedf756c9ca173ea86e89de36b7945ff3572b206a86bc53ba2a6dd75b8
 AUX services-desktop/iptables.service 478 RMD160 c95eebf8e1ba7ee1dce7400700bed232630e20f8 SHA1 b8eb5762a16785ead4d3d6e7dd1da59c99b50b78 SHA256 0f382f4145cd082c9f617bdeac279dc9ad4b89d8c5def414611cc16e53f04fc5
 AUX services-desktop/kdm@.service 284 RMD160 14edb6e7f3d75df223a5035ceffd66b861cc220d SHA1 b9e9f0624ac5f24ef75f090fc82a70daddc2bf95 SHA256 99c8e775549497607e5e41a0fe9cbc11b46acfc1ac5aeca0370f45605ec01fa2
@@ -22,4 +22,5 @@ AUX services-sysv/openrc-init.service 1033 RMD160 f9b6544f1c3dbfffef3ea950c63715
 DIST sshd.service 463 RMD160 2ca446597a331831789fc6b1f8a0d11a8b543f4d SHA1 7a61e7f7422a0c7879e22412ab3aacdfebd44733 SHA256 51fee725a34e957342c258c5cfae072b8002d405c3caa9dd99735def3c385aed
 DIST sshd.socket 102 RMD160 fb40df88d7345dbb30d7b76e9e449b3ddd54b5a5 SHA1 313e04677de240a2279c9cfbdfdb5347ac6a9c3b SHA256 efc5cf5e700036acdae0602bc551f71adf9a29af8b85505db7195382fc475f03
 DIST sshd@.service 125 RMD160 635b7139e531d391f4319b055bcc47b56f049201 SHA1 efcf3443df27a6f8354b39bbd8f2e6c42af7bbab SHA256 7a37e9240a7899cfcf8faedf4ebfa282bac86a738a37f38e68f8ed61c781e3fa
-EBUILD systemd-units-9999.ebuild 1181 RMD160 c9eccb4a01cb99cf59a4523670bfc57ca0457758 SHA1 ae29d2383930d0a29211492e8830ef7b84a25021 SHA256 1ebc21b1eb1ab50d1d98db0bb48da290af89dd8dd2f55ebb554f2562e5af0d3d
+EBUILD systemd-units-9999.ebuild 1512 RMD160 a4d20deeb603c41a76d12980d097335b3eeeafc0 SHA1 f2d00d2082659b95b184e7fd23087f1a58e7d433 SHA256 a023fd64116036154178d6226f6be37577e416ca3c84a7d4595020b6f84ee373
+MISC Manifest.orig 5808 RMD160 e1f53e38548f1372a701c604bf60b0867ba083a0 SHA1 8796df8c8707fcab5905bd399a9a7b26a58ee7fa SHA256 0560e641be0de5946b7daed476735bfca00453f0c45f13af134bf8481c84b4d3
diff --git a/sys-apps/systemd-units/files/services-desktop/gdm.service b/sys-apps/systemd-units/files/services-desktop/gdm.service
deleted file mode 100644
index e29643a..0000000
--- a/sys-apps/systemd-units/files/services-desktop/gdm.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Gnome Display Manager
-After=hald.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/gdm -nodaemon
-ExecStop=/usr/sbin/gdm-stop
-
-[Install]
-Alias=display-manager.service
-WantedBy=graphical.target
diff --git a/sys-apps/systemd-units/files/services-desktop/gdm@.service b/sys-apps/systemd-units/files/services-desktop/gdm@.service
new file mode 100644
index 0000000..ce9e789
--- /dev/null
+++ b/sys-apps/systemd-units/files/services-desktop/gdm@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Gnome Display Manager on %I
+Requires=dev-%i.device
+After=dev-%i.device systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/gdm -nodaemon
+ExecStop=/usr/sbin/gdm-stop
+
+[Install]
+Alias=graphical.target.wants/gdm@tty7.service
diff --git a/sys-apps/systemd-units/systemd-units-9999.ebuild b/sys-apps/systemd-units/systemd-units-9999.ebuild
index a81dbe1..f4a4d8b 100644
--- a/sys-apps/systemd-units/systemd-units-9999.ebuild
+++ b/sys-apps/systemd-units/systemd-units-9999.ebuild
@@ -44,4 +44,10 @@ pkg_postinst() {
 	elog "NetworkManager.service has been removed, because it is included"
 	elog "upstream.  Emerge >=net-misc/networkmanager-0.8.2 if you use"
 	elog "NetworkManager."
+	elog
+	elog "The gdm.service has been removed in favour of gdm@.service.  Please"
+	elog "remove the stale symlinks 'display-manager.service' and"
+	elog "'graphical.target.wants/gdm.service' under '/etc/systemd/system'"
+	elog "if you had them enabled, and enable the new service file with"
+	elog "    systemctl enable gdm@.service"
 }