From: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Fri, 16 Feb 2007 03:56:51 +0000 (+0000)
Subject: Version bump.  Includes minor bugfixes.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a1225c48ae55a77332008681deb39fd43ac9debc;p=gentoo.git

Version bump.  Includes minor bugfixes.
Package-Manager: portage-2.1.2-r9
---

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 042b71c06029..61be656922e1 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xdm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.62 2006/12/16 17:05:38 joshuabaergen Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.63 2007/02/16 03:56:50 joshuabaergen Exp $
+
+*xdm-1.1.4 (16 Feb 2007)
+
+  16 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org> +xdm-1.1.4.ebuild:
+  Version bump.  Includes minor bugfixes.
 
 *xdm-1.1.3 (16 Dec 2006)
 
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 08269b634b76..f84115777593 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -17,6 +17,7 @@ SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4 files/xw
 DIST xdm-1.0.5.tar.bz2 363931 RMD160 bdd25a22146ffb495416c580d83c4dbaf6fdc3c9 SHA1 ed7bbef74a820ccca093a827c86bc440a9e89a0d SHA256 4550c517bd6dcd842c1e4ba6545a4850a7fd708ec2ab831b573f49a40c6defae
 DIST xdm-1.1.0.tar.bz2 380736 RMD160 e4818520b924aebc18dd07431bb73f899a5f4366 SHA1 6a940ce1a9adc9652982024f218d76ce7894c0cf SHA256 7e90bb9f7d6d9da2ce8271cd7786aab93b631e8b622b884b1e8d616100584561
 DIST xdm-1.1.3.tar.bz2 386319 RMD160 95ebd4ba4ddc871b3dfab3520c853f9024fc65e6 SHA1 d3f85da5f4e5a272bef128e91286281ef707202a SHA256 9e640974c132ef1faafedc77e4602d55457b2791006b677cec071ee8afbf9a74
+DIST xdm-1.1.4.tar.bz2 386272 RMD160 40a13574822349e030310de0729eb0b37c95847a SHA1 facf81071a4308c63f3dfd897d7f4a755da5b1bd SHA256 928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073
 EBUILD xdm-1.0.5.ebuild 1379 RMD160 fd7b92a61fbf5caf92e646ee29617b55aeec4aa3 SHA1 fba4f1fe105ce21ab08f972451a5b41db6ab3062 SHA256 1c3288f840b9a4efc2aa64c18d740f07d98762cd79d5d90ccee029b4f8340f5c
 MD5 a5075c38b5da601afb553107dcc3bb24 xdm-1.0.5.ebuild 1379
 RMD160 fd7b92a61fbf5caf92e646ee29617b55aeec4aa3 xdm-1.0.5.ebuild 1379
@@ -29,10 +30,14 @@ EBUILD xdm-1.1.3.ebuild 1397 RMD160 73eb25044bca60bf3618c81af63f4caeabb7be68 SHA
 MD5 48f1152bc657ca9fa8af745115997ff4 xdm-1.1.3.ebuild 1397
 RMD160 73eb25044bca60bf3618c81af63f4caeabb7be68 xdm-1.1.3.ebuild 1397
 SHA256 fae637844b6d5f95fd80548dec29b397ccd3fd1fc905015c3d0028727b69b343 xdm-1.1.3.ebuild 1397
-MISC ChangeLog 10597 RMD160 d8bfef3e63abcad41bc3d86ccf9a19d82917afca SHA1 844bd9592b8f1ce5234970bef67b63d7e5e8eeeb SHA256 7d0fd5c210156a6fadc675ff8a1fa2fa2e49900f571571b36755581d4ed713ad
-MD5 dbb48471678c7410612790395dca11a6 ChangeLog 10597
-RMD160 d8bfef3e63abcad41bc3d86ccf9a19d82917afca ChangeLog 10597
-SHA256 7d0fd5c210156a6fadc675ff8a1fa2fa2e49900f571571b36755581d4ed713ad ChangeLog 10597
+EBUILD xdm-1.1.4.ebuild 1397 RMD160 62b2d45df21bead30e75268ce682f3c89396ca6e SHA1 70ae4fdee00305f86a684a2924c37edd686a8046 SHA256 663edb1114c6543b3de5d4ad739863fb7c054bddd85d6098e152419fcc81f3ef
+MD5 aafc3f66dabdb5d84083865e1fcf3905 xdm-1.1.4.ebuild 1397
+RMD160 62b2d45df21bead30e75268ce682f3c89396ca6e xdm-1.1.4.ebuild 1397
+SHA256 663edb1114c6543b3de5d4ad739863fb7c054bddd85d6098e152419fcc81f3ef xdm-1.1.4.ebuild 1397
+MISC ChangeLog 10742 RMD160 5926eccb7721aa5b3e72ca6e61c286edc68ed3c0 SHA1 ce52e80f9791def1706ff3ca7f5e73496fdaf406 SHA256 6f432533d575a6c937de4c52ed00e568af3eaf3cd4167dde27f5cdd7f0906dd5
+MD5 b5482a49a98e7322aeb4a592903d6b6f ChangeLog 10742
+RMD160 5926eccb7721aa5b3e72ca6e61c286edc68ed3c0 ChangeLog 10742
+SHA256 6f432533d575a6c937de4c52ed00e568af3eaf3cd4167dde27f5cdd7f0906dd5 ChangeLog 10742
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -46,3 +51,6 @@ SHA256 305c0e1d87c7a00ca46f5a0ea5ab9e113a3a3fc29a9e2fc96dd44d861a44e708 files/di
 MD5 d687843cc1e0f104aebb3216843557aa files/digest-xdm-1.1.3 232
 RMD160 51f4a2fca722b4e60fec996109d30c3ac13a6092 files/digest-xdm-1.1.3 232
 SHA256 5c0c9d4adae75a8d008482b39b2368517f09b44a70c57f358d9094881ca844f2 files/digest-xdm-1.1.3 232
+MD5 99737280c678162a0e2154cd4fa006d3 files/digest-xdm-1.1.4 232
+RMD160 748c691afa3a64e09dfaf1dfe401137cadc5fc54 files/digest-xdm-1.1.4 232
+SHA256 e55f6a70663af0a09b03821996174e91e32ff1522d638b8879fb1e96e645489f files/digest-xdm-1.1.4 232
diff --git a/x11-apps/xdm/files/digest-xdm-1.1.4 b/x11-apps/xdm/files/digest-xdm-1.1.4
new file mode 100644
index 000000000000..ef787e37d9f4
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-1.1.4
@@ -0,0 +1,3 @@
+MD5 a2b4c280f3e324d081a0d9ed76a8a123 xdm-1.1.4.tar.bz2 386272
+RMD160 40a13574822349e030310de0729eb0b37c95847a xdm-1.1.4.tar.bz2 386272
+SHA256 928238ea20e074372659b2902de0e0d754083196911319319795fdbfd1ca6073 xdm-1.1.4.tar.bz2 386272
diff --git a/x11-apps/xdm/xdm-1.1.4.ebuild b/x11-apps/xdm/xdm-1.1.4.ebuild
new file mode 100644
index 000000000000..433adf73de88
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.4.ebuild,v 1.1 2007/02/16 03:56:50 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit multilib x-modular pam
+
+DEFAULTVT="vt7"
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="xprint ipv6 pam"
+
+RDEPEND="x11-apps/xrdb
+	x11-libs/libXdmcp
+	x11-libs/libXaw
+	>=x11-apps/xinit-1.0.2-r3
+	x11-libs/libXinerama
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-apps/sessreg"
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+PATCHES="${FILESDIR}/wtmp.patch
+	${FILESDIR}/xwilling-hang.patch"
+
+CONFIGURE_OPTIONS="$(use_enable xprint)
+	$(use_enable ipv6)
+	$(use_with pam)
+	--with-default-vt=${DEFAULTVT}
+	--with-xdmconfigdir=/etc/X11/xdm"
+
+pkg_setup() {
+	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
+		die "Build x11-libs/libXaw with USE=xprint."
+	fi
+}
+
+src_install() {
+	x-modular_src_install
+	exeinto /usr/$(get_libdir)/X11/xdm
+	doexe ${FILESDIR}/Xsession
+	newpamd ${FILESDIR}/xdm.pamd xdm
+}
+
+pkg_preinst() {
+	x-modular_pkg_preinst
+
+	# Check for leftover /usr/lib/X11/xdm symlink
+	if [[ -L "/usr/lib/X11/xdm" ]]; then
+		ewarn "/usr/lib/X11/xdm is a symlink; deleting."
+		rm /usr/lib/X11/xdm
+	fi
+}