summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus D. Hanwell <cryos@gentoo.org>2005-03-10 19:01:02 +0000
committerMarcus D. Hanwell <cryos@gentoo.org>2005-03-10 19:01:02 +0000
commitdd53094cbe5d9edb9423f8f7a08f5438479a41c2 (patch)
treeff0cc47e1c2661ee96a8b1972f392c7a41b0cb1f /app-emulation/emul-linux-x86-xlibs
parentuse enewuser. bug #53064. (diff)
downloadgentoo-2-dd53094cbe5d9edb9423f8f7a08f5438479a41c2.tar.gz
gentoo-2-dd53094cbe5d9edb9423f8f7a08f5438479a41c2.tar.bz2
gentoo-2-dd53094cbe5d9edb9423f8f7a08f5438479a41c2.zip
Added an extra check for a bad symlink, bug 84441.
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-emulation/emul-linux-x86-xlibs')
-rw-r--r--app-emulation/emul-linux-x86-xlibs/ChangeLog6
-rw-r--r--app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild9
2 files changed, 13 insertions, 2 deletions
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 5f55bdec8ed2..a4c836699862 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/emul-linux-x86-xlibs
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.25 2005/03/10 01:13:57 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.26 2005/03/10 19:01:02 cryos Exp $
+
+ 10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+ emul-linux-x86-xlibs-1.2-r7.ebuild:
+ Added an extra check for a bad symlink, bug 84441.
10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
emul-linux-x86-xlibs-1.2-r7.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild
index 633b88dacacc..9676edc6cc50 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.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/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild,v 1.3 2005/03/10 01:13:57 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild,v 1.4 2005/03/10 19:01:02 cryos Exp $
inherit multilib
@@ -19,6 +19,13 @@ RDEPEND="virtual/libc
S=${WORKDIR}
+pkg_preinst() {
+ # Check for bad symlink before installing, bug 84441.
+ if [ -L /emul/linux/x86/usr/lib/X11 ]; then
+ rm -f /emul/linux/x86/usr/lib/X11
+ fi
+}
+
src_install() {
mkdir -p ${D}/etc/env.d/
cp -Rpvf ${WORKDIR}/* ${D}/