Fixed BUG #62110.

6 files changed, 111 insertions, 4 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index bf359561b56f..3b922101b8d4 100644
--- 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.11 2004/08/29 03:45:50 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.12 2004/08/29 23:15:42 kugelfang Exp $
+
+*emul-linux-x86-xlibs-1.2-r1 (30 Aug 2004)
+
+  30 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> +files/XI18N_OBJS,
+  +files/XLC_LOCALE, +emul-linux-x86-xlibs-1.2-r1.ebuild:
+  Fixed BUG #62110. Workaround by Evgeny Stambulchik.
 
   28 Aug 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-xlibs-1.2.ebuild:
   stable on amd64
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 0c1264774148..d2d540a43b0f 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,11 +1,15 @@
+MD5 a00331902d99842a966cfa795b243d07 ChangeLog 2065
 MD5 4d540f090a9dc25984616f8d59df4bef emul-linux-x86-xlibs-1.0.ebuild 792
-MD5 f54334c57b272822037d93b4b12f7944 emul-linux-x86-xlibs-1.2.ebuild 700
 MD5 1537f98b276f5d878d65162a9bf12ea5 emul-linux-x86-xlibs-1.1-r1.ebuild 1577
-MD5 84b606fd8cb91f95642a89c19ef7cb5c ChangeLog 1830
 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 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1-r1 79
+MD5 cd9c31c31b815bc3cd9959b8f55cc97b emul-linux-x86-xlibs-1.2-r1.ebuild 923
+MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
 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
new file mode 100644
index 000000000000..47226beed8fb
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild
@@ -0,0 +1,26 @@
+# 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 $
+
+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"
+
+S=${WORKDIR}
+
+src_install() {
+	mkdir -p ${D}/etc/env.d/
+	echo "LDPATH=/usr/X11R6/lib32" > ${D}/etc/env.d/75emul-linux-x86-xlibs
+	cp -Rpvf ${WORKDIR}/* ${D}/
+	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/
+}
diff --git a/app-emulation/emul-linux-x86-xlibs/files/XI18N_OBJS b/app-emulation/emul-linux-x86-xlibs/files/XI18N_OBJS
new file mode 100644
index 000000000000..cd1dc8f88014
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/XI18N_OBJS
@@ -0,0 +1,7 @@
+# CATEGORY(XLC|XIM|OM)	SHARED_LIBRARY_NAME	FUNCTION_NAME
+#
+#	XI18N objects table for C locale
+#
+XLC	common/xlcDef	_XlcDefaultLoader	# XLC_open
+XIM	common/ximcp	_XimOpenIM _XimRegisterIMInstantiateCallback  _XimUnRegisterIMInstantiateCallback # XIM_open	XIM_register XIM_unregister
+XOM	common/xomGeneric 	_XomGenericOpenOM	# XOM_open
diff --git a/app-emulation/emul-linux-x86-xlibs/files/XLC_LOCALE b/app-emulation/emul-linux-x86-xlibs/files/XLC_LOCALE
new file mode 100644
index 000000000000..13f3acd902b8
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/XLC_LOCALE
@@ -0,0 +1,63 @@
+#  $Xorg: C,v 1.3 2000/08/17 19:46:59 cpqbld Exp $
+#  XLocale Database Sample for C.
+#  $XFree86: xc/nls/XLC_LOCALE/C,v 1.3 2000/02/25 21:02:32 dawes Exp $
+# 
+
+# 
+# 	XLC_FONTSET category
+# 
+XLC_FONTSET
+# 	fs0 class (7 bit ASCII)
+fs0	{
+	charset	{
+		name	ISO8859-1:GL
+	}
+	font	{
+		primary		ISO8859-1:GL
+		vertical_rotate	all
+	}
+}
+END XLC_FONTSET
+
+# 
+# 	XLC_XLOCALE category
+# 
+XLC_XLOCALE
+
+encoding_name		STRING
+mb_cur_max		1
+state_depend_encoding	False
+
+wc_encoding_mask	\x30000000
+wc_shift_bits		7
+
+
+
+
+
+
+use_stdc_env		True
+force_convert_to_mb	True
+
+
+# 	cs0 class
+cs0	{
+	side		GL:Default
+	length		1
+	wc_encoding	\x00000000
+	ct_encoding	ISO8859-1:GL
+}
+
+# 	cs1 class
+cs1	{
+	side		GR:Default
+	length		1
+
+	wc_encoding	\x30000000
+
+
+
+	ct_encoding	ISO8859-1:GR
+}
+
+END XLC_XLOCALE
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r1
new file mode 100644
index 000000000000..f9927af394de
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r1
@@ -0,0 +1 @@
+MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900