summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2005-12-18 19:35:57 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2005-12-18 19:35:57 +0000
commit33e495a00d1a74ef770163fa8b256da98455028f (patch)
treee1aaeb1ae5832220dc2aa8cefe6f95a652e2e5f2 /x11-apps
parentBump for 7.0RC4. (diff)
downloadgentoo-2-33e495a00d1a74ef770163fa8b256da98455028f.tar.gz
gentoo-2-33e495a00d1a74ef770163fa8b256da98455028f.tar.bz2
gentoo-2-33e495a00d1a74ef770163fa8b256da98455028f.zip
Added check/delete for /usr/lib/X11/xdm symlinks.
(Portage version: 2.1_pre1)
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/xdm/ChangeLog5
-rw-r--r--x11-apps/xdm/xdm-1.0.0.ebuild12
2 files changed, 15 insertions, 2 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/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
+}