summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2005-12-18 19:59:52 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2005-12-18 19:59:52 +0000
commit28c7b6a6f4f8aa2f5451fab9f80468874baade8d (patch)
treed23dd85d415496cec348b99e418d41e5fa302102 /x11-apps/xdm
parentBump for 7.0RC4. (diff)
downloadhistorical-28c7b6a6f4f8aa2f5451fab9f80468874baade8d.tar.gz
historical-28c7b6a6f4f8aa2f5451fab9f80468874baade8d.tar.bz2
historical-28c7b6a6f4f8aa2f5451fab9f80468874baade8d.zip
Added check/delete for /usr/lib/X11/xdm symlinks.
Package-Manager: portage-2.1_pre1
Diffstat (limited to 'x11-apps/xdm')
-rw-r--r--x11-apps/xdm/ChangeLog5
-rw-r--r--x11-apps/xdm/Manifest4
-rw-r--r--x11-apps/xdm/xdm-1.0.0.ebuild12
3 files changed, 18 insertions, 3 deletions
diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 7055958ef990..dc4c5e612404 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,9 @@
# 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.31 2005/12/18 19:29:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.32 2005/12/18 19:35:57 joshuabaergen Exp $
+
+ 18 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org> xdm-1.0.0.ebuild:
+ Added check/delete for /usr/lib/X11/xdm symlinks.
*xdm-1.0.0 (18 Dec 2005)
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index f3910b81f7be..5125644602fa 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,7 +1,9 @@
-MD5 ba64799b3b1c58fb7bbf73e4b904030c ChangeLog 5444
+MD5 6de29b61d7b329992d7ae677eeb67c00 ChangeLog 5698
MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521
MD5 3fedecc3fbffb16a7971743fa68a3bff files/digest-xdm-0.99.4 63
+MD5 a0dad1cf27804aaee3e1ede1e780872d files/digest-xdm-1.0.0 62
MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
MD5 584252c9909d51023ea18799151cf12e files/xdm.start 3415
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
MD5 5faf0057d0843964e2f675bdf2a200fc xdm-0.99.4.ebuild 987
+MD5 b78e6ea0b1d21b977d0c5e73f1be5038 xdm-1.0.0.ebuild 1191
diff --git a/x11-apps/xdm/xdm-1.0.0.ebuild b/x11-apps/xdm/xdm-1.0.0.ebuild
index 8e392d40e018..e9aeb3486812 100644
--- a/x11-apps/xdm/xdm-1.0.0.ebuild
+++ b/x11-apps/xdm/xdm-1.0.0.ebuild
@@ -1,6 +1,6 @@
# 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-1.0.0.ebuild,v 1.1 2005/12/18 19:29:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.0.0.ebuild,v 1.2 2005/12/18 19:35:57 joshuabaergen Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -36,3 +36,13 @@ src_install() {
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
+}