Fixed the extra symlinking a bit, thanks to Herbie Hopkins <herbie@hopkins.net>.

Package-Manager: portage-2.0.51.19

3 files changed, 16 insertions, 11 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 7ea0637e7b14..729b8668ffbe 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2005/03/09 22:35:39 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.24 2005/03/10 01:10:14 cryos Exp $
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  emul-linux-x86-xlibs-1.2-r7.ebuild:
+  Fixed the extra symlinking a bit, thanks to Herbie Hopkins
+  <herbie@hopkins.net>.
 
 *emul-linux-x86-xlibs-1.2-r7 (09 Mar 2005)
 
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index c94230b25c6a..75db7998d7a0 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 a50f1831b0748097c75d952228935e6a emul-linux-x86-xlibs-1.2-r7.ebuild 2172
+MD5 cf0dbc6c31bca869a2493401470381f9 emul-linux-x86-xlibs-1.2-r7.ebuild 2198
 MD5 5aa3dda16a384e963673cea0f46d1bff emul-linux-x86-xlibs-1.2-r6.ebuild 2001
 MD5 26af0271c02a589244e73f51df4410a2 emul-linux-x86-xlibs-1.2-r3.ebuild 1815
-MD5 67fd33ebaba70da5b29c72bcf25602aa ChangeLog 4295
+MD5 c3b9ddebb3fdb089b14fc6a8a39ac5e1 ChangeLog 4471
 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)
 
-iD8DBQFCL3pcntT9W3vfTuoRAk0AAJ9N9c7nvTBcKZ6L23gI447kRgRg1gCfXUl7
-46CBf/5zm1DTvUe/JNRx7jw=
-=6JjQ
+iD8DBQFCL56AntT9W3vfTuoRAuzCAKCf3vWT8wM2lA2W4kaWCmGHmzwemACfXQKu
+fVRhq22GbLDXwIEfPHQA5Wc=
+=d+iL
 -----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 502931bbe302..8693313936e1 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.1 2005/03/09 22:35:39 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild,v 1.2 2005/03/10 01:10:14 cryos Exp $
 
 inherit multilib
 
@@ -39,8 +39,8 @@ src_install() {
 
 	# Create some extra symlinks, bug 81045.
 	cd ${D}/emul/linux/x86/usr/lib
-	ln -s libX11.so.6 libX11.so
-	ln -s libXext.so.6 libXext.so
+	ln -s `readlink libX11.so.6` libX11.so
+	ln -s `readlink libXext.so.6` libXext.so
 
 	# We don't use this any more
 	rm -rf ${D}/usr/X11R6
@@ -67,8 +67,8 @@ pkg_postinst() {
 
 pkg_postrm() {
 	# The symlink should be removed too.
-	if [ -L /usr/$(get_libdir)/X11/locale/lib && \
-		! -d /emul/linux/x86/usr/lib ]; then
+	if [ -L /usr/$(get_libdir)/X11/locale/lib ] && \
+		[ ! -d /emul/linux/x86/usr/lib ]; then
 		rm -f /usr/$(get_libdir)/X11/locale/lib
 	fi
 }