[gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/, gnome-base/gdm/files/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     1ec5de286fd5263128fe03e3c3d3533542c9df28
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 06:22:34 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 06:22:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1ec5de28

gnome-base/gdm: install systemd unit file, bump to EAPI 4, don't use dosym

---
 gnome-base/gdm/files/gdm@.service                  |   11 +++++++++++
 .../gdm/{gdm-3.0.4.ebuild => gdm-3.0.4-r1.ebuild}  |   14 ++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/gnome-base/gdm/files/gdm@.service b/gnome-base/gdm/files/gdm@.service
new file mode 100644
index 0000000..aa5f406
--- /dev/null
+++ b/gnome-base/gdm/files/gdm@.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Gnome Display Manager on %I
+Requires=dev-%i.device
+After=dev-%i.device
+
+[Service]
+ExecStart=/usr/bin/gdm -nodaemon
+ExecStop=/usr/sbin/gdm-stop
+
+[Install]
+Alias=graphical.target.wants/gdm@tty7.service

diff --git a/gnome-base/gdm/gdm-3.0.4.ebuild b/gnome-base/gdm/gdm-3.0.4-r1.ebuild
similarity index 95%
rename from gnome-base/gdm/gdm-3.0.4.ebuild
rename to gnome-base/gdm/gdm-3.0.4-r1.ebuild
index 7386973..736fd65 100644
--- a/gnome-base/gdm/gdm-3.0.4.ebuild
+++ b/gnome-base/gdm/gdm-3.0.4-r1.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="yes"
 
-inherit autotools eutils gnome2 pam
+inherit autotools eutils gnome2 pam systemd
 
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="http://www.gnome.org/projects/gdm/"
@@ -133,13 +133,15 @@ src_install() {
 
 	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
 
+	# Install the systemd unit file
+	systemd_dounit "${FILESDIR}/gdm@.service"
+
 	# FIXME: Remove dosym usage, gone in EAPI 4
 	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${D}/usr/sbin/gdm"
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
+	rm -f "${ED}/usr/sbin/gdm"
+	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/sbin/gdm"
 	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
+	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/bin/gdm"
 
 	# log, etc.
 	keepdir /var/log/gdm