Use systemd_newunit().

Package-Manager: portage-2.2.0_alpha41_p11/cvs/Linux x86_64

5 files changed, 25 insertions, 25 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/Manifest b/x11-apps/xdm/Manifest
index f0a1ac22a48e..031255e2805f 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA256
 
 AUX Xsession 1521 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c SHA1 b94699037a667c716462296c25b4d912fd5d783b SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6
-AUX systemd-service.patch 354 RMD160 e4b35ed3a2c664f5f77fada493026c4fdf5ef2bd SHA1 df8280673d8cd4b290200c4f4aa40492bc0df718 SHA256 94816639f211e0a423e6d365fc2b5f49683591e4f8a196f1dec6a1b71713ca3c
+AUX xdm.service 224 RMD160 7ba7db150289c1272e9dd5e4fdcc8bbbf89469d0 SHA1 f78de6486ba5e0eddffb67be3512d5e59742492f SHA256 fce971a7e36c9cf7e6f877b530a1a953a5e0516080ec1b8f427f56dd09e99caf
 AUX xwilling-hang.patch 589 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b SHA1 df9d176961a1a84da2ee94667fb601634268c923 SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4
 DIST xdm-1.1.10.tar.bz2 423578 RMD160 c5f6b3bba2d1294b560ad50e2eaaa90097c62dee SHA1 45eb013aa14ddd8d385b200b94fb0fbcbe09b860 SHA256 1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f
 EBUILD xdm-1.1.10-r1.ebuild 1313 RMD160 7b176ae8c7935b7e493a933d2eaba6d5233be93d SHA1 6fc96802ba63ca46d55915e412144f1e712b0350 SHA256 6bdc61bd529aac883efdf966a3be23741ccd3779a2761f1924a159a078baef8a
-EBUILD xdm-1.1.10-r2.ebuild 1413 RMD160 befadd229621ee3f8fe93514133ef03506e0e44f SHA1 cebfe9a220775ef53992a5f5b7b6662a2d694d3e SHA256 482ac035f14382f7c6b08c0a42a1e574a036dd2bbe188823009f24d25fd8c285
-MISC ChangeLog 17152 RMD160 af3b6f97425fbe882bdcc06c88258f59df19f4c4 SHA1 5145de67bcf6f46faa4d653589167fc4f9bf084a SHA256 5b20db8b99938221afb2be938110b76e4b421d4171640a107fec339701e387bc
+EBUILD xdm-1.1.10-r2.ebuild 1405 RMD160 ffc36ea1bc4931315c244184c63a92e09d585aa5 SHA1 e4c9348f6fb195008279b2b766f9606ea2318a66 SHA256 2fe9ff502014684b89b23bc6159c4c3d3b8a21d1585ed097b6ed33d94ee4dd8d
+MISC ChangeLog 17302 RMD160 c9f07d4b2faee460dc3aba933e4c9cd275ca5d29 SHA1 3b2f4138d35013ef7bbb8f851dc611ae87660064 SHA256 afefa1266a335675bcbbd9465352d60805db5f440ff59a749bc83a4cb5fd4ef2
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk33SyQACgkQfXuS5UK5QB2NqwP+KO3Fa568UOWCL95B5Prd1JQD
-epm9PDZ0ZHrk4m4f9WVOrAEn8BxX9VpcYalzY1DnmVg+Aic1lAmPQXMS8F/ZEaIs
-JVuwEBaRQ6rUrUSRODMKZCQyMPxPzdCYRf9jn3xm/piFTcInWXdUQdKamO1D4qkl
-dkehaAOdmZxunrXeIn4=
-=wZf0
+iJwEAQEIAAYFAk3+HuEACgkQfXuS5UK5QB20RwQArkgHJqdA2jm5fNkIXr0U55DT
+4ewApCoATKt3n9JIFcnX5ZW8s1jHuNchW2p33w262HpRecfZWmyLqziqyz8vB4yx
+06z2y1KwDFx3Z9qrd1geeJzo3W7aiFPt+697QNPM5YRHBnbyScqE8YssRbIP7qii
++U/autl3WS+PPqHsQ4Y=
+=jgPT
 -----END PGP SIGNATURE-----
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
 }