Version bump for 7.2RC2. Contains minor bugfixes.

Package-Manager: portage-2.1.2_rc1-r6

4 files changed, 80 insertions, 5 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 59df7e2969e9..b2269a53ddd0 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.58 2006/10/04 02:05:33 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.59 2006/11/14 16:29:25 joshuabaergen Exp $
+
+*xdm-1.1.1 (14 Nov 2006)
+
+  14 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org> +xdm-1.1.1.ebuild:
+  Version bump for 7.2RC2.  Contains minor bugfixes.
 
 *xdm-1.1.0 (04 Oct 2006)
 
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index fced49bcb05a..1b5cf6525358 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -16,6 +16,7 @@ RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b files/xwilling-hang.patch 589
 SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4 files/xwilling-hang.patch 589
 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.1.tar.bz2 381303 RMD160 269e147e6ec0701683675aa3d607f713205d986b SHA1 75ff3a6e5b332f87953482a4ccb66fc6e9f78eab SHA256 7cf3908a181578ac8db1bd125034de9a3bb7e2ab1ea112a19f531801d28c8b08
 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
@@ -24,10 +25,14 @@ EBUILD xdm-1.1.0.ebuild 1393 RMD160 1ce3d951183e9e7c32caa7a209afff54a7e51dae SHA
 MD5 aab513488fed142ae57a5eed39c41b5d xdm-1.1.0.ebuild 1393
 RMD160 1ce3d951183e9e7c32caa7a209afff54a7e51dae xdm-1.1.0.ebuild 1393
 SHA256 71673448ffb539783f94c55123999981ce2f4dab9df7adc55db1abbdab9f861b xdm-1.1.0.ebuild 1393
-MISC ChangeLog 9794 RMD160 b7938c7f6ad6998d9a7b0b997e79b9102dfead46 SHA1 b88a35d9b8fdb384662e4c0f153bd709aca9c348 SHA256 085bde87c1027f66328214a498adfba6111cdbdc9c801090cb800389b768ec90
-MD5 42ecfd821342ab1fcc7857b34e99f781 ChangeLog 9794
-RMD160 b7938c7f6ad6998d9a7b0b997e79b9102dfead46 ChangeLog 9794
-SHA256 085bde87c1027f66328214a498adfba6111cdbdc9c801090cb800389b768ec90 ChangeLog 9794
+EBUILD xdm-1.1.1.ebuild 1397 RMD160 755aae412d87606a795f2d191d28ed1d5ddbfaa9 SHA1 976ee36b6d3f45de369bf452c1b2202e0459ac71 SHA256 f9783fcfa6d8f67ce68922fb23cd4f87288ed1f790523ee4a320cbb16a69c37b
+MD5 61357c5b22584b446d52c00a9e104c76 xdm-1.1.1.ebuild 1397
+RMD160 755aae412d87606a795f2d191d28ed1d5ddbfaa9 xdm-1.1.1.ebuild 1397
+SHA256 f9783fcfa6d8f67ce68922fb23cd4f87288ed1f790523ee4a320cbb16a69c37b xdm-1.1.1.ebuild 1397
+MISC ChangeLog 9954 RMD160 391e3faf489bd64d3b58e0c321df46dd0a0d12c4 SHA1 8f10e5dfe3d6058e75f4840a4bb5c64042414577 SHA256 d1ec9d80fa288adeca8a5d4bd5ca01b71c73f9c9913cc535f9fdd9a61782b873
+MD5 fdca63e11469f39d63d8c85d921d7e8a ChangeLog 9954
+RMD160 391e3faf489bd64d3b58e0c321df46dd0a0d12c4 ChangeLog 9954
+SHA256 d1ec9d80fa288adeca8a5d4bd5ca01b71c73f9c9913cc535f9fdd9a61782b873 ChangeLog 9954
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -38,3 +43,6 @@ SHA256 d9e331b55536f294b67a10763ec6d0b83ad1ebed0507b48701670be6f87cdc0f files/di
 MD5 615a1f3b7a3bf744b902932b7e3475e4 files/digest-xdm-1.1.0 232
 RMD160 2bd29dd2a2832dc97051a81da362945027b20cc4 files/digest-xdm-1.1.0 232
 SHA256 305c0e1d87c7a00ca46f5a0ea5ab9e113a3a3fc29a9e2fc96dd44d861a44e708 files/digest-xdm-1.1.0 232
+MD5 ae4164a5f154f9055a89864624dd67dc files/digest-xdm-1.1.1 232
+RMD160 06a030df489b9e2a052feeeb39372714fa11bfe8 files/digest-xdm-1.1.1 232
+SHA256 574bf0885f2286629cc8a06cbbf8a22272e088e7bc28583a58e196a5563295cf files/digest-xdm-1.1.1 232
diff --git a/x11-apps/xdm/files/digest-xdm-1.1.1 b/x11-apps/xdm/files/digest-xdm-1.1.1
new file mode 100644
index 000000000000..44a78419eefe
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-1.1.1
@@ -0,0 +1,3 @@
+MD5 1bc39006d43b72103bad2c82d0240871 xdm-1.1.1.tar.bz2 381303
+RMD160 269e147e6ec0701683675aa3d607f713205d986b xdm-1.1.1.tar.bz2 381303
+SHA256 7cf3908a181578ac8db1bd125034de9a3bb7e2ab1ea112a19f531801d28c8b08 xdm-1.1.1.tar.bz2 381303
diff --git a/x11-apps/xdm/xdm-1.1.1.ebuild b/x11-apps/xdm/xdm-1.1.1.ebuild
new file mode 100644
index 000000000000..33a16e7214d9
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.1.ebuild
@@ -0,0 +1,59 @@
+# 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.1.1.ebuild,v 1.1 2006/11/14 16:29:25 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
+}