Use XORG_CONFIGURE_OPTIONS, install a systemd unit file.

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

4 files changed, 93 insertions, 2 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 119571d42785..f8c285b99f11 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.116 2011/03/05 18:01:50 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.117 2011/06/14 11:50:15 mgorny Exp $
+
+*xdm-1.1.10-r2 (14 Jun 2011)
+
+  14 Jun 2011; Michał Górny <mgorny@gentoo.org> +xdm-1.1.10-r2.ebuild,
+  +files/systemd-service.patch:
+  Use XORG_CONFIGURE_OPTIONS, install a systemd unit file.
 
   05 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> xdm-1.1.10-r1.ebuild:
   ppc64 stable wrt #354237
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 5f8a3bcfff35..f0a1ac22a48e 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX Xsession 1521 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c SHA1 b94699037a667c716462296c25b4d912fd5d783b SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6
+AUX systemd-service.patch 354 RMD160 e4b35ed3a2c664f5f77fada493026c4fdf5ef2bd SHA1 df8280673d8cd4b290200c4f4aa40492bc0df718 SHA256 94816639f211e0a423e6d365fc2b5f49683591e4f8a196f1dec6a1b71713ca3c
 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
-MISC ChangeLog 16961 RMD160 3ef2e14a28cbb5f29895d08ea96e54caad205470 SHA1 378f48dae70150f2ccb0d5597ad49672fca11973 SHA256 e1564e60fcb85a257add1a4c385336ea28d6fe9c7f3ab2f6a44b1d1f0e10b4c0
+EBUILD xdm-1.1.10-r2.ebuild 1413 RMD160 befadd229621ee3f8fe93514133ef03506e0e44f SHA1 cebfe9a220775ef53992a5f5b7b6662a2d694d3e SHA256 482ac035f14382f7c6b08c0a42a1e574a036dd2bbe188823009f24d25fd8c285
+MISC ChangeLog 17152 RMD160 af3b6f97425fbe882bdcc06c88258f59df19f4c4 SHA1 5145de67bcf6f46faa4d653589167fc4f9bf084a SHA256 5b20db8b99938221afb2be938110b76e4b421d4171640a107fec339701e387bc
 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
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xdm/files/systemd-service.patch b/x11-apps/xdm/files/systemd-service.patch
new file mode 100644
index 000000000000..ad0e22036dce
--- /dev/null
+++ b/x11-apps/xdm/files/systemd-service.patch
@@ -0,0 +1,13 @@
+--- /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/xdm-1.1.10-r2.ebuild b/x11-apps/xdm/xdm-1.1.10-r2.ebuild
new file mode 100644
index 000000000000..2c8c63cc8857
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.10-r2.ebuild
@@ -0,0 +1,58 @@
+# 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 $
+
+EAPI=3
+
+inherit multilib xorg-2 pam systemd
+
+DEFAULTVT="vt7"
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 pam"
+
+RDEPEND="x11-apps/xrdb
+	x11-libs/libXdmcp
+	x11-libs/libXaw
+	>=x11-apps/xinit-1.0.2-r3
+	x11-libs/libXinerama
+	x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-apps/sessreg
+	x11-apps/xconsole
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+PATCHES=(
+	"${FILESDIR}"/systemd-service.patch
+	"${FILESDIR}"/xwilling-hang.patch
+)
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_with pam)
+		--with-default-vt=${DEFAULTVT}
+		--with-xdmconfigdir=/etc/X11/xdm
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+	exeinto /usr/$(get_libdir)/X11/xdm
+	doexe "${FILESDIR}"/Xsession || die
+	if use pam; then
+		# Use system-local-login to get pam_loginuid and pam_ck_connector from
+		# pambase. This is required to get active ConsoleKit session since 0.4.2.
+		pamd_mimic system-local-login xdm auth account session
+	fi
+	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
+	keepdir /var/lib/xdm
+
+	systemd_dounit xdm@.service || die
+}