Version bump. This merely contains the setuid patch against the previous

version.
Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 84 insertions, 5 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 32991997990f..5f6d62a14718 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.46 2006/06/20 16:15:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.47 2006/06/24 03:15:54 joshuabaergen Exp $
+
+*xdm-1.0.5 (24 Jun 2006)
+
+  24 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> +xdm-1.0.5.ebuild:
+  Version bump.  This merely contains the setuid patch against the previous
+  version.
 
 *xdm-1.0.4-r1 (20 Jun 2006)
 
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 2ccbd6888c6a..3285a2a54bbe 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -19,14 +19,19 @@ MD5 7c232f7520a16f42492ee90056cd4609 files/xwilling-hang.patch 589
 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b files/xwilling-hang.patch 589
 SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4 files/xwilling-hang.patch 589
 DIST xdm-1.0.4.tar.bz2 363486 RMD160 fe4f62979d1f4fed394464e535544435c41fb8b3 SHA1 f7f490fb87c9249fbf6f4f92e730b6eb90365959 SHA256 d1c7a90da45ab38100c86311432832dcb968fd58bfc04007b3bcdb5446d6fb9b
+DIST xdm-1.0.5.tar.bz2 363931 RMD160 bdd25a22146ffb495416c580d83c4dbaf6fdc3c9 SHA1 ed7bbef74a820ccca093a827c86bc440a9e89a0d SHA256 4550c517bd6dcd842c1e4ba6545a4850a7fd708ec2ab831b573f49a40c6defae
 EBUILD xdm-1.0.4-r1.ebuild 1575 RMD160 f8a2a3392f04525ee3feb1fb7f06810daa757171 SHA1 74bc174c8492e1858c1a93ed1aaf48f1dc442da0 SHA256 9b859f3d5bea9423c8c8bbec1687ac93755705087cfc8c6964158de260a5fb47
 MD5 1d6306f00af035523da9bdc1a6c554b3 xdm-1.0.4-r1.ebuild 1575
 RMD160 f8a2a3392f04525ee3feb1fb7f06810daa757171 xdm-1.0.4-r1.ebuild 1575
 SHA256 9b859f3d5bea9423c8c8bbec1687ac93755705087cfc8c6964158de260a5fb47 xdm-1.0.4-r1.ebuild 1575
-MISC ChangeLog 8300 RMD160 a82dd36b955e67de04c3cd2b948749746cd3b8f4 SHA1 d5368a2a12e40dfeb3f6b97e2b4153cc4e0efd4e SHA256 5a94e4677123c9085f6b716ad811fd2ea66fc3d1c099fac18681c6a3493dd18b
-MD5 b8c7b9a1cabe482716ff6b84990b9dd0 ChangeLog 8300
-RMD160 a82dd36b955e67de04c3cd2b948749746cd3b8f4 ChangeLog 8300
-SHA256 5a94e4677123c9085f6b716ad811fd2ea66fc3d1c099fac18681c6a3493dd18b ChangeLog 8300
+EBUILD xdm-1.0.5.ebuild 1546 RMD160 5dbe243afe83eb37ae35721a0dcc09e0962195d6 SHA1 94baa26fb74fdceee04d8cc34e3f2bea2766c99b SHA256 c916c43ca3a24e794eefa19020076d9b43ac0aeeadba994befd7fadb718b4855
+MD5 860e533bad12932e712ec23e20c034a9 xdm-1.0.5.ebuild 1546
+RMD160 5dbe243afe83eb37ae35721a0dcc09e0962195d6 xdm-1.0.5.ebuild 1546
+SHA256 c916c43ca3a24e794eefa19020076d9b43ac0aeeadba994befd7fadb718b4855 xdm-1.0.5.ebuild 1546
+MISC ChangeLog 8494 RMD160 a7f0b3b81ab89b98f38d4b01156448842cb17fba SHA1 98cf911f36cbaccacf3dff132628205b024887e6 SHA256 6e33e497ab3fdce2ccc920e95bd707fa0e675b6bfb43b7896a2fdfe93ebdd3ce
+MD5 0f81983d7ae0e052fd1b948c746388cf ChangeLog 8494
+RMD160 a7f0b3b81ab89b98f38d4b01156448842cb17fba ChangeLog 8494
+SHA256 6e33e497ab3fdce2ccc920e95bd707fa0e675b6bfb43b7896a2fdfe93ebdd3ce ChangeLog 8494
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -34,3 +39,6 @@ SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata
 MD5 4be6a6f46dd21ebbf73d82ba6c14a652 files/digest-xdm-1.0.4-r1 232
 RMD160 251810cd68573b105e0533c94aa0e4be3e730003 files/digest-xdm-1.0.4-r1 232
 SHA256 2a53fff01cb85c3eb1265f2f990d6ab4d8a3dc9235015734ec09366de03578c9 files/digest-xdm-1.0.4-r1 232
+MD5 0918fa81f924780fa977920e65e9fd11 files/digest-xdm-1.0.5 232
+RMD160 6b8601ab705de7c8d1df97221d91577d7ab4cc7f files/digest-xdm-1.0.5 232
+SHA256 d9e331b55536f294b67a10763ec6d0b83ad1ebed0507b48701670be6f87cdc0f files/digest-xdm-1.0.5 232
diff --git a/x11-apps/xdm/files/digest-xdm-1.0.5 b/x11-apps/xdm/files/digest-xdm-1.0.5
new file mode 100644
index 000000000000..f2e6203a0042
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-1.0.5
@@ -0,0 +1,3 @@
+MD5 205cbf9cd4161dffd63d3516e681dbed xdm-1.0.5.tar.bz2 363931
+RMD160 bdd25a22146ffb495416c580d83c4dbaf6fdc3c9 xdm-1.0.5.tar.bz2 363931
+SHA256 4550c517bd6dcd842c1e4ba6545a4850a7fd708ec2ab831b573f49a40c6defae xdm-1.0.5.tar.bz2 363931
diff --git a/x11-apps/xdm/xdm-1.0.5.ebuild b/x11-apps/xdm/xdm-1.0.5.ebuild
new file mode 100644
index 000000000000..b3c715411493
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.0.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.0.5.ebuild,v 1.1 2006/06/24 03:15:54 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/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	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
+}
+
+pkg_postinst() {
+	x-modular_pkg_postinst
+
+	ewarn "Install x11-apps/sessreg, or you won't be able to log in."
+	ewarn "It cannot be added as a dependency yet, because it isn't"
+	ewarn "tested on all architectures."
+}