diff options
| author |   Marcus D. Hanwell <cryos@gentoo.org> | 2005-03-10 01:10:14 +0000 |
|---|---|---|
| committer | Marcus D. Hanwell <cryos@gentoo.org> | 2005-03-10 01:10:14 +0000 |
| commit | 2e0e068dbe850d0e893236af3a023d479c258fb3 (patch) | |
| tree | fc4b6c071ab98ffee57d5a3905f367ec7ace3270 /app-emulation/emul-linux-x86-xlibs | |
| parent | stable on amd64 (diff) | |
| download | gentoo-2-2e0e068dbe850d0e893236af3a023d479c258fb3.tar.gz gentoo-2-2e0e068dbe850d0e893236af3a023d479c258fb3.tar.bz2 gentoo-2-2e0e068dbe850d0e893236af3a023d479c258fb3.zip | |
Fixed the extra symlinking a bit, thanks to Herbie Hopkins <herbie@hopkins.net>.
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-emulation/emul-linux-x86-xlibs')
| -rw-r--r-- | app-emulation/emul-linux-x86-xlibs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild | 10 |
2 files changed, 11 insertions, 6 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/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 } |