Drop redundant systemd unit install, it is supported upstream now.

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

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index b3776410aeb58d48308be20c9fef4dc40323dbe5..d7556ef23e5214ff90f1831deea303b03f63bbe9 100644 (file)
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,9 @@
 # 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.126 2011/10/03 17:55:17 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.127 2011/10/10 08:56:06 mgorny Exp $
+
+  10 Oct 2011; Michał Górny <mgorny@gentoo.org> xdm-1.1.11.ebuild:
+  Drop redundant systemd unit install, it is supported upstream now.
 
   03 Oct 2011; Joseph Jezak <josejx@gentoo.org> xdm-1.1.10-r2.ebuild:
   Marked ppc ppc64 stable for bug #380421.

diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index c674701e17da91543015f045fa1ba707e46f0334..a28a7cffa2fef9ee08df076c4663b5b1f3402b17 100644 (file)
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0001-Fix-missing-linking-dependency-on-ldl.patch 1159 RMD160 2d44d8bcd5484f65ba6de3db485aae979bc8fce7 SHA1 e8ca1fde1d9716191b1b6263abfcaf2d3e434a1e SHA256 4ce9f99385ab2b851a37e79b01276986853c5c3977dbc3151a5e644e89535b89
 AUX Xsession 1521 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c SHA1 b94699037a667c716462296c25b4d912fd5d783b SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6
@@ -9,13 +9,15 @@ DIST xdm-1.1.10.tar.bz2 423578 RMD160 c5f6b3bba2d1294b560ad50e2eaaa90097c62dee S
 DIST xdm-1.1.11.tar.bz2 446612 RMD160 574b5bda0b46a43d0df474279d03e49fa93c9a92 SHA1 8195a8e17d71d18cb89813d04b69a3750e9e818e SHA256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47
 EBUILD xdm-1.1.10-r1.ebuild 1313 RMD160 7b176ae8c7935b7e493a933d2eaba6d5233be93d SHA1 6fc96802ba63ca46d55915e412144f1e712b0350 SHA256 6bdc61bd529aac883efdf966a3be23741ccd3779a2761f1924a159a078baef8a
 EBUILD xdm-1.1.10-r2.ebuild 1970 RMD160 f1bc2940fee345629f57af97157e407ddf9e20c3 SHA1 754f7e84c71676ed67ae94353d33df9aea612334 SHA256 63a143577df305b64fa981eb16dc18298611376a19e311d1dc072bf7c7d4695b
-EBUILD xdm-1.1.11.ebuild 1838 RMD160 912ca9c6186124cfc187e995701622b2c4ad5084 SHA1 6f4d77fa82c627bcf8b268cb95436cb910dcea24 SHA256 cddcb340b857a36e7eff6d259b16323943ac4d282f4115c97ab9f81bd1f4f2a3
-MISC ChangeLog 18457 RMD160 d216c816d197aa7028bb5636d9d1bd005a30630d SHA1 ad5740bae4e5e39d288e198712f1b29b1196b8cc SHA256 6e1574d50fc2e79ba98a7a64e8e4e8e14c1d6a025fcfe6d65f95b3abba568b77
+EBUILD xdm-1.1.11.ebuild 1814 RMD160 0419da6e0ae9c8e3a33da32506b24532b09bb0d5 SHA1 b79c06706250b575d1abc5d0c08e34f10e78667f SHA256 e8709b496ce72e81a90353ebe80d6845eb6b2c71bd067f09a30539d8393c115d
+MISC ChangeLog 18596 RMD160 b55d3056ead1d09ea06c519322d7d6eaf362eaf9 SHA1 bb1756386ea274efb4dadede995e2e938c5df603 SHA256 a7edcb2805e4cc6fef54854f97e8b56bea92ecf1bbc98d486614e73e620b4fbe
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6J9wsACgkQcsIHjyDViGRFRgCg06Re1T8gfPornGWs+zSgxTvK
-zDAAoKd1DDSyNWaDFiL78oYdWdNcUmdp
-=prl9
+iJwEAQEIAAYFAk6Ss8gACgkQfXuS5UK5QB2q8AP+PYSOwGKjj5h0G9ZWi755JzWD
+oDAF+lC7mAyFh5RvzJ0kP590QPEnbHJiM01mJjjp7P2GDyotBLQRzj5huLuy2FUU
+6D3gsx2w6sBVVjDJCh69igS6D5AF6jBBqm0yCvwndsSUuJq7TTqVXPbrj2gEqHY3
+e8XoO0/eLlrGeZss2Nw=
+=US5Z
 -----END PGP SIGNATURE-----

diff --git a/x11-apps/xdm/xdm-1.1.11.ebuild b/x11-apps/xdm/xdm-1.1.11.ebuild
index 7644ffa70a0b74698ed5e5109c8cd682647abb9f..9978a81b3f2bf67aa08c98638117746704cf5ca3 100644 (file)
--- a/x11-apps/xdm/xdm-1.1.11.ebuild
+++ b/x11-apps/xdm/xdm-1.1.11.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.11.ebuild,v 1.1 2011/10/02 00:40:13 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.11.ebuild,v 1.2 2011/10/10 08:56:06 mgorny Exp $
 
 EAPI=3
 
@@ -32,6 +32,7 @@ pkg_setup() {
        XORG_CONFIGURE_OPTIONS=(
                $(use_enable ipv6)
                $(use_with pam)
+               "$(systemd_with_unitdir)"
                --with-default-vt=${DEFAULTVT}
                --with-xdmconfigdir=/etc/X11/xdm
        )
@@ -48,8 +49,6 @@ src_install() {
        fi
        # Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
        keepdir /var/lib/xdm
-
-       systemd_dounit "${FILESDIR}"/xdm.service || die
 }
 
 pkg_postinst() {