From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QaikB-0003Kv-R6 for garchives@archives.gentoo.org; Sun, 26 Jun 2011 06:22:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEBD21C002; Sun, 26 Jun 2011 06:22:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AD0F81C002 for ; Sun, 26 Jun 2011 06:22:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 009682AC110 for ; Sun, 26 Jun 2011 06:22:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 326238003C for ; Sun, 26 Jun 2011 06:22:46 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1ec5de286fd5263128fe03e3c3d3533542c9df28.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gdm/, gnome-base/gdm/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gdm/files/gdm@.service gnome-base/gdm/gdm-3.0.4-r1.ebuild gnome-base/gdm/gdm-3.0.4.ebuild X-VCS-Directories: gnome-base/gdm/ gnome-base/gdm/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 1ec5de286fd5263128fe03e3c3d3533542c9df28 Date: Sun, 26 Jun 2011 06:22:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e9ec8140100b401bf4d27c41e9ca0213 commit: 1ec5de286fd5263128fe03e3c3d3533542c9df28 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sun Jun 26 06:22:34 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Sun Jun 26 06:22:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D1ec5de28 gnome-base/gdm: install systemd unit file, bump to EAPI 4, don't use dosy= m --- gnome-base/gdm/files/gdm@.service | 11 +++++++++++ .../gdm/{gdm-3.0.4.ebuild =3D> 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=3DGnome Display Manager on %I +Requires=3Ddev-%i.device +After=3Ddev-%i.device + +[Service] +ExecStart=3D/usr/bin/gdm -nodaemon +ExecStop=3D/usr/sbin/gdm-stop + +[Install] +Alias=3Dgraphical.target.wants/gdm@tty7.service diff --git a/gnome-base/gdm/gdm-3.0.4.ebuild b/gnome-base/gdm/gdm-3.0.4-r= 1.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: $ =20 -EAPI=3D"3" +EAPI=3D"4" GCONF_DEBUG=3D"yes" =20 -inherit autotools eutils gnome2 pam +inherit autotools eutils gnome2 pam systemd =20 DESCRIPTION=3D"GNOME Display Manager" HOMEPAGE=3D"http://www.gnome.org/projects/gdm/" @@ -133,13 +133,15 @@ src_install() { =20 local gentoodir=3D"${WORKDIR}/${GDM_EXTRA}" =20 + # 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" =20 # log, etc. keepdir /var/log/gdm