diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2011-06-19 16:07:15 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2011-06-19 16:07:15 +0000 |
| commit | b9dea28d5df267e24e7cf85219d9228a88cf99b6 (patch) | |
| tree | 2246567115ebe2d2e9c56909f3e6ffa97fcbb294 /x11-apps | |
| parent | Version bump (diff) | |
| download | gentoo-2-b9dea28d5df267e24e7cf85219d9228a88cf99b6.tar.gz gentoo-2-b9dea28d5df267e24e7cf85219d9228a88cf99b6.tar.bz2 gentoo-2-b9dea28d5df267e24e7cf85219d9228a88cf99b6.zip | |
Use systemd_newunit().
(Portage version: 2.2.0_alpha41_p11/cvs/Linux x86_64)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xdm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xdm/files/systemd-service.patch | 13 | ||||
| -rw-r--r-- | x11-apps/xdm/files/xdm.service | 10 | ||||
| -rw-r--r-- | x11-apps/xdm/xdm-1.1.10-r2.ebuild | 5 |
4 files changed, 17 insertions, 17 deletions
diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog index f8c285b99f11..532d34e41ed4 100644 --- a/x11-apps/xdm/ChangeLog +++ b/x11-apps/xdm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xdm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.117 2011/06/14 11:50:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.118 2011/06/19 16:07:15 mgorny Exp $ + + 19 Jun 2011; Michał Górny <mgorny@gentoo.org> xdm-1.1.10-r2.ebuild, + +files/xdm.service, -files/systemd-service.patch: + Use systemd_newunit(). *xdm-1.1.10-r2 (14 Jun 2011) diff --git a/x11-apps/xdm/files/systemd-service.patch b/x11-apps/xdm/files/systemd-service.patch deleted file mode 100644 index ad0e22036dce..000000000000 --- a/x11-apps/xdm/files/systemd-service.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- /dev/null 2011-06-14 08:28:46.818246020 +0200 -+++ xdm@.service 2011-06-14 11:19:39.000000000 +0200 -@@ -0,0 +1,10 @@ -+[Unit] -+Description=X-Window Display Manager on %I -+Requires=dev-%i.device -+After=dev-%i.device systemd-user-sessions.service -+ -+[Service] -+ExecStart=/usr/bin/xdm -nodaemon -+ -+[Install] -+Alias=graphical.target.wants/xdm@tty7.service diff --git a/x11-apps/xdm/files/xdm.service b/x11-apps/xdm/files/xdm.service new file mode 100644 index 000000000000..faaf72444498 --- /dev/null +++ b/x11-apps/xdm/files/xdm.service @@ -0,0 +1,10 @@ +[Unit] +Description=X-Window Display Manager on %I +Requires=dev-%i.device +After=dev-%i.device systemd-user-sessions.service + +[Service] +ExecStart=/usr/bin/xdm -nodaemon + +[Install] +Alias=graphical.target.wants/xdm@tty7.service diff --git a/x11-apps/xdm/xdm-1.1.10-r2.ebuild b/x11-apps/xdm/xdm-1.1.10-r2.ebuild index 2c8c63cc8857..2b6da9df148a 100644 --- a/x11-apps/xdm/xdm-1.1.10-r2.ebuild +++ b/x11-apps/xdm/xdm-1.1.10-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.10-r2.ebuild,v 1.1 2011/06/14 11:50:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.10-r2.ebuild,v 1.2 2011/06/19 16:07:15 mgorny Exp $ EAPI=3 @@ -29,7 +29,6 @@ DEPEND="${RDEPEND} x11-proto/xproto" PATCHES=( - "${FILESDIR}"/systemd-service.patch "${FILESDIR}"/xwilling-hang.patch ) @@ -54,5 +53,5 @@ src_install() { # Keep /var/lib/xdm. This is where authfiles are stored. See #286350. keepdir /var/lib/xdm - systemd_dounit xdm@.service || die + systemd_newunit "${FILESDIR}"/xdm.service 'xdm@.service' || die } |