fix the locale fix so that it works for apps other than adobe acrobat

3 files changed, 28 insertions, 8 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 3b922101b8d4..71112cf8a2fd 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.12 2004/08/29 23:15:42 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.13 2004/08/31 09:40:35 lv Exp $
+
+  31 Aug 2004; Travis Tilley <lv@gentoo.org>
+  emul-linux-x86-xlibs-1.2-r1.ebuild:
+  fix the locale fix so that it works for apps other than adobe acrobat
 
 *emul-linux-x86-xlibs-1.2-r1 (30 Aug 2004)
 
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index d2d540a43b0f..f4904a39a17a 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,15 +1,15 @@
-MD5 a00331902d99842a966cfa795b243d07 ChangeLog 2065
 MD5 4d540f090a9dc25984616f8d59df4bef emul-linux-x86-xlibs-1.0.ebuild 792
+MD5 b43083f959211bf6bfcbc0575838f11c emul-linux-x86-xlibs-1.2-r1.ebuild 1491
+MD5 f54334c57b272822037d93b4b12f7944 emul-linux-x86-xlibs-1.2.ebuild 700
 MD5 1537f98b276f5d878d65162a9bf12ea5 emul-linux-x86-xlibs-1.1-r1.ebuild 1577
+MD5 e4005e12a8b9f1fa86e3793b747ee174 ChangeLog 2214
 MD5 1cb2f9811cd8b4e77855a04d02033703 emul-linux-x86-xlibs-1.1.ebuild 1552
-MD5 f54334c57b272822037d93b4b12f7944 emul-linux-x86-xlibs-1.2.ebuild 700
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
-MD5 cd9c31c31b815bc3cd9959b8f55cc97b emul-linux-x86-xlibs-1.2-r1.ebuild 923
 MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
+MD5 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1-r1 79
+MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r1 78
+MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
 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
-MD5 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1-r1 79
 MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2 78
-MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r1 78
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild
index 47226beed8fb..946ca0121e14 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.1 2004/08/29 23:15:42 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild,v 1.2 2004/08/31 09:40:35 lv Exp $
 
 DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
 HOMEPAGE="http://www.gentoo.org/"
@@ -24,3 +24,19 @@ src_install() {
 	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/
 }
+
+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
+		sleep 10
+	fi
+}
+