Added an extra check for a bad symlink, bug 84441.

Package-Manager: portage-2.0.51.19

3 files changed, 18 insertions, 7 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/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 7563308fd84d..5369620425fd 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 01eb2e7ef492293651763a892f5a938f emul-linux-x86-xlibs-1.2-r7.ebuild 2197
+MD5 1bc94040ae985ed43cf336d4e8a854b6 emul-linux-x86-xlibs-1.2-r7.ebuild 2356
 MD5 5aa3dda16a384e963673cea0f46d1bff emul-linux-x86-xlibs-1.2-r6.ebuild 2001
 MD5 26af0271c02a589244e73f51df4410a2 emul-linux-x86-xlibs-1.2-r3.ebuild 1815
-MD5 7507623710496cd125466a841b5c1cfb ChangeLog 4588
+MD5 d30bd05ace36590f12eb06fb902758bc ChangeLog 4732
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
 MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
 MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r3 78
@@ -15,7 +15,7 @@ MD5 42f42e0727df82ff01db88d5a027f010 files/75emul-linux-x86-x 81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCL59cntT9W3vfTuoRAoV7AJ9+aBFioHQqPAYHG8KeeblYczNuXQCfV7FK
-+mcWOXxlG7VaG2/lBixk8C8=
-=bDOd
+iD8DBQFCMJl/ntT9W3vfTuoRAowYAJ4n7UqLj3JVTeP08j0WOURmBz4HXACdHHaA
+rL0ASCaeoj7sHk1lo1tHx18=
+=zR98
 -----END PGP SIGNATURE-----
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}/