From: Joshua Baergen <joshuabaergen@gentoo.org>
Date: Thu, 27 Oct 2005 04:53:04 +0000 (+0000)
Subject: Add new snapshot that includes greeter lib.  Also re-do some installation
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=328c7c15731bd5599e95cefb9be38054b12f6a37;p=gentoo.git

Add new snapshot that includes greeter lib.  Also re-do some installation
paths to refine what follows upstream rules and what doesn't.
Package-Manager: portage-2.0.53_rc6
---

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 34ad37a5652e..9ed264265e5b 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.18 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.19 2005/10/27 04:53:04 joshuabaergen Exp $
+
+*xdm-0.99.2_p20051026 (27 Oct 2005)
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/gentoo_locations.patch, +xdm-0.99.2_p20051026.ebuild:
+  Add new snapshot that includes greeter lib.  Also re-do some installation
+  paths to refine what follows upstream rules and what doesn't.
 
 *xdm-0.99.2 (20 Oct 2005)
 
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index b0302cda2de8..786f45535489 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,9 +1,11 @@
-MD5 7a40243e5d1292f62f039a72ca3466f7 ChangeLog 3107
+MD5 0eddcb80ff140ddce2a0ba5746531975 ChangeLog 3409
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521
 MD5 d73361c3f6f0e02b6250ec10fc75339b files/digest-xdm-0.99.0-r2 63
 MD5 d9fffaee0823717bfcbd1a092eea8947 files/digest-xdm-0.99.1_pre20050905-r1 75
 MD5 312bef9c67863fd073c888f59a70a74e files/digest-xdm-0.99.1_pre20051014 75
 MD5 ccbf8839e65dca1bf93576922f24b517 files/digest-xdm-0.99.2 63
+MD5 9802977e2e111eff050f7532453a83d5 files/digest-xdm-0.99.2_p20051026 73
+MD5 41e31f3a9d8c6a1e4520bb34eaaaa49a files/gentoo_locations.patch 266
 MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
 MD5 584252c9909d51023ea18799151cf12e files/xdm.start 3415
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
@@ -11,3 +13,4 @@ MD5 3697f66bdc1dcb15452af130e67c021d xdm-0.99.0-r2.ebuild 875
 MD5 a4bad0c00c5ba2220db6e8eb9aed0354 xdm-0.99.1_pre20050905-r1.ebuild 1118
 MD5 afa1b0b1acc1a1237c302fab8bc8d50d xdm-0.99.1_pre20051014.ebuild 993
 MD5 7a86cd41d144f8770b88b832f6261f2e xdm-0.99.2.ebuild 893
+MD5 2cdd185ce98176f720bab2845bf2f5e2 xdm-0.99.2_p20051026.ebuild 1066
diff --git a/x11-apps/xdm/files/digest-xdm-0.99.2_p20051026 b/x11-apps/xdm/files/digest-xdm-0.99.2_p20051026
new file mode 100644
index 000000000000..8dc99df4e8e0
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-0.99.2_p20051026
@@ -0,0 +1 @@
+MD5 bd6b83e0eb7cc183c3321c81aef6ae8a xdm-0.99.2_p20051026.tar.bz2 356927
diff --git a/x11-apps/xdm/files/gentoo_locations.patch b/x11-apps/xdm/files/gentoo_locations.patch
new file mode 100644
index 000000000000..c9cf67987ee8
--- /dev/null
+++ b/x11-apps/xdm/files/gentoo_locations.patch
@@ -0,0 +1,11 @@
+--- config/Makefile.am	2005-10-26 21:58:56.924178584 -0600
++++ config/Makefile.am.new	2005-10-26 22:39:29.336395720 -0600
+@@ -14,7 +14,7 @@
+ 	Xresources \
+ 	Xservers
+ 
+-dist_xdmlib_SCRIPTS = \
++dist_xdmconfig_SCRIPTS = \
+ 	Xsession \
+ 	GiveConsole \
+ 	TakeConsole \
diff --git a/x11-apps/xdm/xdm-0.99.2_p20051026.ebuild b/x11-apps/xdm/xdm-0.99.2_p20051026.ebuild
new file mode 100644
index 000000000000..b5bd6d39e9c2
--- /dev/null
+++ b/x11-apps/xdm/xdm-0.99.2_p20051026.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.2_p20051026.ebuild,v 1.1 2005/10/27 04:53:04 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+SNAPSHOT="yes"
+
+inherit x-modular pam
+
+DESCRIPTION="X.Org xdm application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="xprint ipv6 pam"
+RDEPEND="x11-libs/libXdmcp
+	x11-libs/libXaw
+	>=x11-apps/xinit-0.99.1_pre20050905-r1
+	x11-libs/libX11
+	x11-libs/libXt"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+SRC_URI="http://dev.gentoo.org/~joshuabaergen/distfiles/${P}.tar.bz2"
+
+CONFIGURE_OPTIONS="$(use_enable xprint)
+	$(use_enable ipv6)
+	$(use_with pam)
+	--with-xdmconfigdir=/etc"
+
+PATCHES="${FILESDIR}/gentoo_locations.patch"
+
+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 /etc/X11/xdm
+	doexe ${FILESDIR}/Xsession
+	newpamd ${FILESDIR}/xdm.pamd xdm
+}