systemd: update the unit to install as display-manager.service.

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

3 files changed, 28 insertions, 32 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index bb9f89276627..f54b41a518ac 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.144 2012/03/19 06:09:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.145 2012/08/20 21:28:34 mgorny Exp $
+
+  20 Aug 2012; Michał Górny <mgorny@gentoo.org> xdm-1.1.11-r1.ebuild:
+  systemd: update the unit to install as display-manager.service.
 
   19 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   -files/0001-Fix-missing-linking-dependency-on-ldl.patch,
@@ -587,4 +590,3 @@
 
   08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +xdm-0.99.0.ebuild:
   Initial commit for modular X.
-
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 2afadb99de8c..97ffb3df2fd1 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX Xsession 1521 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c SHA1 b94699037a667c716462296c25b4d912fd5d783b SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6
-AUX xdm-consolekit.patch 5712 RMD160 c0611e6c2fe6dd61075ac50323707d05f6b1a720 SHA1 c84807ca7e44c5b7114dd3059cd6d877dd28ff70 SHA256 902bf08f10244325897bc410e7fb81178e47dcae9d96c115992ece860c1b211d
-DIST xdm-1.1.11.tar.bz2 446612 RMD160 574b5bda0b46a43d0df474279d03e49fa93c9a92 SHA1 8195a8e17d71d18cb89813d04b69a3750e9e818e SHA256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47
-EBUILD xdm-1.1.11-r1.ebuild 1835 RMD160 480a25fa2b71ea2bbee53935a4ce78cc04dbf8e0 SHA1 55eb478b97d3fbb33695e3fafb88f906338d112a SHA256 74c6d77e34749d0a1d602de5cb3dde59c757ce65e09c41067119d973063e67f8
-MISC ChangeLog 20790 RMD160 b8a62de1ab84cc8613439a6e004d317c287cfb44 SHA1 0a12aa92c46ba793cf2517fe4c806fb7a06e43c2 SHA256 5d812884b6b877d97d2da67a2f19d529a64e4ccd131ddb01d5eaeca1f0652e28
-MISC metadata.xml 263 RMD160 9ff3bbaed628e48ed00387ddb9990a91a434584e SHA1 4c3a3264e51fb691f208420459fa19f1b235ca8a SHA256 b5893b2e9cadfba8dcee59fe1044e4131621077472177850c1b6ae1d8eef2b4e
+AUX Xsession 1521 SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555 WHIRLPOOL 079887cd7f29fe11e3306da145d4279e99d93c131850a03d49c35befd6d001d8c69a53b9b528a7808ff5913f8787adc90d6fb0f041234462d8f6204a9be0d127
+AUX xdm-consolekit.patch 5712 SHA256 902bf08f10244325897bc410e7fb81178e47dcae9d96c115992ece860c1b211d SHA512 d87ec56e4b7d067709679f222d3bd9009f1496d66c3c4335458b54e2a468200e3c7ac99843330c23bad7049995c93e8f3c74f3161529c6fb488e94e9fcd4752a WHIRLPOOL 89d80047bf95de606a0fd87cb6ce26b6aad755c8ea1e83db7adf0d3751e655be271ae4db5dd2097226e79359a3d85e7b485d4bedcf5bf800c2add4552429ec23
+DIST xdm-1.1.11.tar.bz2 446612 SHA256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 SHA512 fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5 WHIRLPOOL e505cfc5615d93ce8911f30b10b99698b38fa71dd468770616b95d34a0da2212f080f12a1457c715fc58beea56f4d9adc2f41dd63e3bf431b8d85182f0c250d8
+EBUILD xdm-1.1.11-r1.ebuild 1518 SHA256 1b317316e20e217c0dd99fbdd5a106af94ede1d9bc4b14cbf58c47238f8623dc SHA512 49922b14700a129ecdccb53eda891f5bcb2dd34c3016f47749e66284db49586321f6e46376db6f49ccbf31ec344426ad373b280be4c916a42192846ebbb65db1 WHIRLPOOL 5e6549d32d2e9c71ca73b431c27fe406c4348e5eb4ec8a59c84f0a1c40eb4dc8a99a3d35ae65f98862395c88aa488dee70ebc2293f8af3cc74caea97c00f8f3d
+MISC ChangeLog 20925 SHA256 1ad8e7f41fa45e10b95396b5f1df28137296ba69e8bf0ed27310352db3cbc9c3 SHA512 2ac8f8d0019972fe28da4971638637a4fd2afc8bf680fe7b9d49d1007351cf0c0e20e51dcbdb8bde77cb8a8b02f12797fdea14a6db21bc712e73c6878512e844 WHIRLPOOL 7cd20297a41853221c79127b43e95ef438b0983fbbae999231d8f7a033d4a839151d5c747459c913e3b4c6992df9b646c6b391e0de26af75ce9c51211fbd2a55
+MISC metadata.xml 263 SHA256 b5893b2e9cadfba8dcee59fe1044e4131621077472177850c1b6ae1d8eef2b4e SHA512 4596b313fdeed4339fb7d34f5d53f23ba42432c2ed921386dd0cbeec0966ba3507b3380094957ff3999b5bb4dbf145b55cf0cfe8dd5a8b322b91d1eab9e645a1 WHIRLPOOL 885a9f94d8f75483f1f10a1e27353500fcf64acf16c8eaad97a2dc86b35c976d795a938dcf4f05f38b113c2da98eda47e86b0419d671b2abcdf3deefacb562a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPZs2fAAoJEEdUh39IaPFN/2sH/3anW9Y3g33Wh5RsL1+YSBFT
-E5PDn02uC+BGhpgqBOky4JduddzYKbcAtNWKXpK6BNbIBJ5muHD79rjjI7Bn7Yri
-FRdyYJ/eACGqTIi9jgiPvlbe839TH9M8qm0Q8xkbHsJSx0mxQfD6/pHZFzW08YI4
-OMdJ9IwtP/meEoIznmk0D53Ctb7l3UF65E/DxIidi/EIfLKEq+rPd2Gw6Q3FcqBs
-RTRxGUaAzgRQk6Sub8D8FMsAztblONLf/boN5ngVGONW5GMlibCLMXHQkSSwjacC
-tqYq+D9A4UJj3Yz+4uOcgH/FT0r2i7QvgVhe6XAJ5I91jvYgHzf5ZpwtBWfgJzA=
-=76OS
+iJwEAQEIAAYFAlAyrEkACgkQfXuS5UK5QB2HBQQApyYF3n+Thgfjssz+HSNkCokc
+PxhhTVaN+LRdzSfELAzHXNwSAMKgzT4XhvOsgKyfUS0ef1VbZYNA4Y4ymnFV4qF/
+BpJwgX1nbJGBPc3ZFod3KkfGbUX0c62fYtXLmnf7lvSuYq5igS1sB8Myqdlb2gle
+ECEhBUqZqRKpynJLP+c=
+=StOl
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/xdm/xdm-1.1.11-r1.ebuild b/x11-apps/xdm/xdm-1.1.11-r1.ebuild
index afdb14e41b8e..c5a663102ece 100644
--- a/x11-apps/xdm/xdm-1.1.11-r1.ebuild
+++ b/x11-apps/xdm/xdm-1.1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild,v 1.10 2012/03/18 19:14:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11-r1.ebuild,v 1.11 2012/08/20 21:28:34 mgorny Exp $
 
 EAPI=4
 
@@ -26,7 +26,8 @@ RDEPEND="x11-apps/xrdb
 	x11-apps/sessreg
 	x11-apps/xconsole
 	consolekit? ( sys-auth/consolekit )
-	pam? ( virtual/pam )"
+	pam? ( virtual/pam )
+	!<sys-apps/systemd-187"
 DEPEND="${RDEPEND}
 	consolekit? ( !=sys-auth/pambase-20101024-r1 )
 	x11-proto/xineramaproto
@@ -45,6 +46,14 @@ pkg_setup() {
 	)
 }
 
+src_prepare() {
+	# fedora invented that in -187...
+	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
+		xdm.service.in || die
+
+	xorg-2_src_prepare
+}
+
 src_install() {
 	xorg-2_src_install
 
@@ -56,16 +65,3 @@ src_install() {
 	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
 	keepdir /var/lib/xdm
 }
-
-pkg_postinst() {
-	# Mea culpa, feel free to remove that after some time --mgorny.
-	if [[ -L "${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}'@tty7'.service ]]
-	then
-		ebegin "Renaming ${PN}@tty7.service to ${PN}.service"
-		ln -s "${ROOT}"/lib/systemd/system/xdm.service \
-			"${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}.service && \
-		rm -f "${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}'@tty7'.service
-		eend ${?} \
-			"Please try to re-enable xdm.service"
-	fi
-}