Install Xsession to /usr/libdir, not /etc, so we don't get 2 copies of it.

Package-Manager: portage-2.0.53_rc6

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 247cd0afc1795713a76e2c887956103406c45ec3..f1953b20b5f3c75333126383ee146be49b259f8c 100644 (file)
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2005/11/02 04:21:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.23 2005/11/02 06:20:03 spyderous Exp $
+
+*xdm-0.99.2_p20051026-r2 (02 Nov 2005)
+
+  02 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xdm-0.99.2_p20051026-r2.ebuild:
+  Install Xsession to /usr/libdir, not /etc, so we don't get 2 copies of it.
 
 *xdm-0.99.2_p20051026-r1 (02 Nov 2005)
 

diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index e9640a4903c34195ea5b177bbe3159e211cfefdb..e3338c108a258d3eb0894e0348f9629bdd2afd0c 100644 (file)
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,8 +1,10 @@
-MD5 0812cae597a5b35220b6aba84d7e9eec ChangeLog 3972
+MD5 71cbafab2bec3f7c96cb10e60c39e598 ChangeLog 4180
 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 41e31f3a9d8c6a1e4520bb34eaaaa49a files/gentoo_locations.patch 266
 MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
 MD5 584252c9909d51023ea18799151cf12e files/xdm.start 3415
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 856df95596b1d453300cf2f1301324bd xdm-0.99.2_p20051026-r1.ebuild 1074
+MD5 32cb00e3e8e1755d26c132844794da90 xdm-0.99.2_p20051026-r2.ebuild 1097

diff --git a/x11-apps/xdm/files/digest-xdm-0.99.2_p20051026-r2 b/x11-apps/xdm/files/digest-xdm-0.99.2_p20051026-r2
new file mode 100644 (file)
index 0000000..8dc99df
--- /dev/null
+++ b/x11-apps/xdm/files/digest-xdm-0.99.2_p20051026-r2
@@ -0,0 +1 @@
+MD5 bd6b83e0eb7cc183c3321c81aef6ae8a xdm-0.99.2_p20051026.tar.bz2 356927

diff --git a/x11-apps/xdm/xdm-0.99.2_p20051026-r2.ebuild b/x11-apps/xdm/xdm-0.99.2_p20051026-r2.ebuild
new file mode 100644 (file)
index 0000000..67e0c19
--- /dev/null
+++ b/x11-apps/xdm/xdm-0.99.2_p20051026-r2.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-r2.ebuild,v 1.1 2005/11/02 06:20:03 spyderous 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-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"
+
+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 /usr/$(get_libdir)/X11/xdm
+       doexe ${FILESDIR}/Xsession
+       newpamd ${FILESDIR}/xdm.pamd xdm
+}