Use the emul dir in LDPATH.

Package-Manager: portage-2.0.51-r13

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index fbdb2d2a152f9c29abb48da4cee4afa400160885..e206144e46056e6d3f434b67457950bdd3dac8a0 100644 (file)
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2005/01/01 14:12:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.16 2005/01/18 01:37:37 eradicator Exp $
+
+*emul-linux-x86-xlibs-1.2-r2 (17 Jan 2005)
+
+  17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +emul-linux-x86-xlibs-1.2-r2.ebuild:
+  Use the emul dir in LDPATH.
 
   06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
   emul-linux-x86-xlibs-1.2-r1.ebuild:

diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index d580f04a5d504f5aa17de0699ccab2825e218789..5c2036a90a8c24afe3125e2e6ea3ae726195a5c3 100644 (file)
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,10 +1,14 @@
-MD5 25a74f28796c79e440baeb03d96c0da0 ChangeLog 2358
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7dfe53f337da7aad0c52edcb9be70421 ChangeLog 2529
 MD5 aebe8c4f7a9976e86923c346287b0f60 emul-linux-x86-xlibs-1.0.ebuild 794
 MD5 d886d465972f57a9aebe34be2ae4a597 emul-linux-x86-xlibs-1.1.ebuild 1554
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
 MD5 84793ce2a2c8e0d1fca353f31a5e9679 emul-linux-x86-xlibs-1.1-r1.ebuild 1585
-MD5 4fbfc5f46798844e186e586f6c9e1c65 emul-linux-x86-xlibs-1.2-r1.ebuild 1516
 MD5 157995239867d0e41b12c8137ed1dd4f emul-linux-x86-xlibs-1.2.ebuild 708
+MD5 9db9c8d8d703ee9ef3baf1e3b6a88c12 emul-linux-x86-xlibs-1.2-r2.ebuild 1624
+MD5 4fbfc5f46798844e186e586f6c9e1c65 emul-linux-x86-xlibs-1.2-r1.ebuild 1516
 MD5 42f42e0727df82ff01db88d5a027f010 files/75emul-linux-x86-x 81
 MD5 97c2c7b018d1e1d526ab438517a9ad07 files/digest-emul-linux-x86-xlibs-1.0 79
 MD5 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1 79
@@ -13,3 +17,11 @@ MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
 MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
 MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2 78
 MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r1 78
+MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r2 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB7GhrArHZZzCEUG0RAsL/AJ0RfgyZ0RlsFXO8UaKbxwrbGHyokwCfXYqm
+630hqn5iGedFT093H2jUQmk=
+=utSw
+-----END PGP SIGNATURE-----

diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild
new file mode 100644 (file)
index 0000000..8c51abe
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild
@@ -0,0 +1,49 @@
+# 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-r2.ebuild,v 1.1 2005/01/18 01:37:37 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-xlibs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* amd64"
+IUSE=""
+
+DEPEND="virtual/libc
+       >=app-emulation/emul-linux-x86-baselibs-1.2.2-r2"
+
+S=${WORKDIR}
+
+src_install() {
+       mkdir -p ${D}/etc/env.d/
+       echo "LDPATH=/emul/linux/x86/usr/X11R6/lib32" > ${D}/etc/env.d/75emul-linux-x86-xlibs
+       cp -Rpvf ${WORKDIR}/* ${D}/
+
+       # We don't use this symlink any more
+       rm ${D}/usr/X11R6/lib32
+
+       mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C
+       cp ${FILESDIR}/XI18N_OBJS ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C/
+       cp ${FILESDIR}/XLC_LOCALE ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C/
+
+       chown -R root:root ${D}
+}
+
+pkg_postinst() {
+       # do not replace any of the following with $(get_libdir)
+       if [ ! -e /usr/X11R6/lib/X11/locale/lib ] ; then
+               ln -s /emul/linux/x86/usr/X11R6/lib/X11/locale/lib /usr/X11R6/lib/X11/locale/lib
+       elif [ ! -h /usr/X11R6/lib/X11/locale/lib ] ; then
+               echo
+               ewarn "/usr/X11R6/lib/X11/locale/lib isnt a symlink, some apps will"
+               ewarn "refuse to work (adobe acrobat, staroffice, etc). Right now the"
+               ewarn "fix is to install at least xorg 6.7.99.903, which has been made"
+               ewarn "lib64 aware, and then reinstall emul-linux-x86-xlibs."
+               echo
+               epause 10
+       fi
+}

diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2
new file mode 100644 (file)
index 0000000..f9927af
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2
@@ -0,0 +1 @@
+MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900