Drop gentoo_locations patch as it was installing scripts into /etc. Upstream

configure scripts now handle paths the way we want them to.
(Portage version: 2.0.53_rc7)

4 files changed, 52 insertions, 2 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 02067f0344c0..e8b258912f7b 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.26 2005/11/14 05:21:28 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.27 2005/11/17 04:12:58 joshuabaergen Exp $
+
+*xdm-0.99.3_p20051113-r1 (17 Nov 2005)
+
+  17 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdm-0.99.3_p20051113-r1.ebuild:
+  Drop gentoo_locations patch as it was installing scripts into /etc.  Upstream
+  configure scripts now handle paths the way we want them to.
 
 *xdm-0.99.3_p20051113 (14 Nov 2005)
 
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index ddf0d6bbc85e..ba403a161197 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,9 +1,10 @@
-MD5 45514bf11ea74558c06bab777c51aea5 ChangeLog 4675
+MD5 c621baf0a5bebaed15937241ac982611 ChangeLog 4950
 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521
 MD5 9802977e2e111eff050f7532453a83d5 files/digest-xdm-0.99.2_p20051026-r1 73
 MD5 9802977e2e111eff050f7532453a83d5 files/digest-xdm-0.99.2_p20051026-r2 73
 MD5 2f1e9782c240ac184d81d1237a657c71 files/digest-xdm-0.99.3 63
 MD5 f334099b690e3810f47a684f71907360 files/digest-xdm-0.99.3_p20051113 73
+MD5 f334099b690e3810f47a684f71907360 files/digest-xdm-0.99.3_p20051113-r1 73
 MD5 e5c7d9c37e12ad0fc570a818e8304876 files/gentoo_locations-0.99.3.patch 313
 MD5 41e31f3a9d8c6a1e4520bb34eaaaa49a files/gentoo_locations.patch 266
 MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
@@ -12,4 +13,5 @@ MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 856df95596b1d453300cf2f1301324bd xdm-0.99.2_p20051026-r1.ebuild 1074
 MD5 b1e9160b9be8daf79d30513d9db7541e xdm-0.99.2_p20051026-r2.ebuild 1116
 MD5 8637181448c2c5586d0b0e37ced8e169 xdm-0.99.3.ebuild 1039
+MD5 37b53de91c0e8c088d02744d35a8415b xdm-0.99.3_p20051113-r1.ebuild 1068
 MD5 add6bc4f97d61c2bf9209571feeb61f1 xdm-0.99.3_p20051113.ebuild 1120
diff --git a/x11-apps/xdm/files/digest-xdm-0.99.3_p20051113-r1 b/x11-apps/xdm/files/digest-xdm-0.99.3_p20051113-r1
new file mode 100644
index 000000000000..034808847467
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-0.99.3_p20051113-r1
@@ -0,0 +1 @@
+MD5 9a27c48de2b61fefe588af94767bb70f xdm-0.99.3_p20051113.tar.bz2 360039
diff --git a/x11-apps/xdm/xdm-0.99.3_p20051113-r1.ebuild b/x11-apps/xdm/xdm-0.99.3_p20051113-r1.ebuild
new file mode 100644
index 000000000000..b43caae9ef19
--- /dev/null
+++ b/x11-apps/xdm/xdm-0.99.3_p20051113-r1.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.3_p20051113-r1.ebuild,v 1.1 2005/11/17 04:12:58 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit multilib x-modular pam
+
+DESCRIPTION="X.Org xdm application"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="xprint ipv6 pam"
+RDEPEND="x11-apps/xrdb
+	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/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
+}