Version bump, drop obsolete patches.

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

3 files changed, 76 insertions, 12 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 426f13f5a22f..8a65b306248b 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.123 2011/09/21 00:30:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.124 2011/10/02 00:40:13 chithanh Exp $
+
+*xdm-1.1.11 (02 Oct 2011)
+
+  02 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xdm-1.1.11.ebuild:
+  Version bump, drop obsolete patches.
 
   21 Sep 2011; Jeroen Roovers <jer@gentoo.org> xdm-1.1.10-r2.ebuild:
   Stable for HPPA (bug #380421).
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index f82bbb06c0ee..5bc079b68655 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
 AUX xdm.service 176 RMD160 6879cd39adace0fb9a5d56533d074193d97d297b SHA1 a5bfdecec978ee721136f3757d8242782a41d10a SHA256 d4e47166f51638cd7f85905da130cdec8acc8931c70c1d2634287bfa8348f5d2
 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
+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 1974 RMD160 2b6793669c14d519c506c3705100ebd67e08e493 SHA1 4c22a4221bc24044813df670d1a3a5a26f722136 SHA256 48d805688d9bc7fd9d9b866433f2409be83ff19f4ab7ee5602ca819f6ef09525
-MISC ChangeLog 18064 RMD160 112457988fa1f785394bfa6acfbe6cc4b7523fba SHA1 5a80c6640399e7ef71efc955a7752b4d7a5efe0a SHA256 f16c0d734099e66fde98b9c349507e83e88750ec669a24e0f2f5634d2366adc4
+EBUILD xdm-1.1.11.ebuild 1838 RMD160 912ca9c6186124cfc187e995701622b2c4ad5084 SHA1 6f4d77fa82c627bcf8b268cb95436cb910dcea24 SHA256 cddcb340b857a36e7eff6d259b16323943ac4d282f4115c97ab9f81bd1f4f2a3
+MISC ChangeLog 18227 RMD160 e5d3dafe88bc4fa45cde2054fc88cda8836ee785 SHA1 e3fd9b421346e46ef6fbeef2c4d9e846d6ab52a1 SHA256 38f72b82fe547b707b87d3aa7de6d43582160180f7d98db9171f4f5876e69c07
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk55MDwACgkQVWmRsqeSphOmNQCfSv1QvOPOTMCG/u57RjlRd2qf
-1toAnimM+L9dwwAPA6RXC3H4v6pFR1NR
-=sWIV
------END PGP SIGNATURE-----
diff --git a/x11-apps/xdm/xdm-1.1.11.ebuild b/x11-apps/xdm/xdm-1.1.11.ebuild
new file mode 100644
index 000000000000..7644ffa70a0b
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.11.ebuild
@@ -0,0 +1,66 @@
+# 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 $
+
+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"
+
+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 "${FILESDIR}"/xdm.service || die
+}
+
+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
+}