locale issues fixed (?)

5 files changed, 17 insertions, 9 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 56302618f100..fe894f61d862 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.136 2003/05/31 23:45:34 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.137 2003/06/01 05:36:26 seemant Exp $
+
+  31 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild,
+  xfree-4.3.0-r3.ebuild:
+  The locale fixes should be in place now. The only change was to the
+  XFree86-compose.dir.bz2 file on the mirrors. It was changed as suggested in:
+  http://bugs.xfree86.org//cgi-bin/bugzilla/show_bug.cgi?id=224 by Ivan Pascal
+  <pascal@tsu.ru>
 
   30 May 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r2.ebuild:
   Updated to patch 1.1.5 which contains a patch for libXi when using
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index bb99d014910c..b779d53443d7 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,9 +1,9 @@
 MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
-MD5 1c2a24b7a942839b6fa49aff0e3ae95f xfree-4.3.0-r2.ebuild 30492
+MD5 7aa80aa5a30fda5ff9fae0c7b92c632a xfree-4.3.0-r2.ebuild 30492
 MD5 e98a09bb43033618521bf046d8d218fd xfree-4.3.0-r1.ebuild 25059
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
-MD5 9490811e97d3a92c95ee5d0e734e4fc9 xfree-4.3.0-r3.ebuild 31109
-MD5 ebbdc6a0ac194ce92406d401788d8b16 ChangeLog 30008
+MD5 cbf65f67f149849d5a989b613d0fbcd9 xfree-4.3.0-r3.ebuild 31109
+MD5 83ad63501206d4ac3e72ae650fd8cdad ChangeLog 30356
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r2 b/x11-base/xfree/files/digest-xfree-4.3.0-r2
index 21660f88824a..0015c8519cb2 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r2
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r2
@@ -13,7 +13,7 @@ MD5 e3848a87ea835bd80ed91f674e24fb02 sis_drv_src_180403-1.tar.gz 378880
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811
-MD5 794107aa54dda238ab1ab4776b36274d XFree86-compose.dir.bz2 1883
+MD5 4c7920d4b9d2ff1213faff4d718946d6 XFree86-compose.dir.bz2 1877
 MD5 aafd74e26c541382bb382ff338f81f87 XFree86-en_US.UTF-8.old.bz2 7068
 MD5 2e2263bb4adaee6f959fbb6c8df5336a XFree86-locale.alias.bz2 3592
 MD5 d4402be729da91e849aa5b9f506bda06 XFree86-locale.dir.bz2 2094
diff --git a/x11-base/xfree/xfree-4.3.0-r2.ebuild b/x11-base/xfree/xfree-4.3.0-r2.ebuild
index 3b3d57dc5b38..dcc60c6a35ca 100644
--- a/x11-base/xfree/xfree-4.3.0-r2.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.23 2003/05/30 12:47:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r2.ebuild,v 1.24 2003/06/01 05:36:26 seemant Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -420,7 +420,7 @@ src_unpack() {
 	eend 0
 
 	cd ${S}
-	bzcat ${DISTDIR}/XFree86-compose.dir.bz2 > nls/compose.dir
+#	bzcat ${DISTDIR}/XFree86-compose.dir.bz2 > nls/compose.dir
 	bzcat ${DISTDIR}/XFree86-locale.alias.bz2 > nls/locale.alias
 	bzcat ${DISTDIR}/XFree86-locale.dir.bz2 > nls/locale.dir
 	bzcat ${DISTDIR}/XFree86-en_US.UTF-8.old.bz2 > nls/Compose/en_US.UTF-8
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index 18e07d34060e..c13dc289b614 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.10 2003/05/30 09:57:35 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.11 2003/06/01 05:36:26 seemant Exp $
 
 # Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
 # that only we only strip stuff that are safe to strip ...
@@ -129,7 +129,8 @@ DEPEND=">=sys-apps/baselayout-1.8.3
 # unzip - needed for savage driver (version 1.1.27t)
 # x11-libs/xft -- blocked because of interference with xfree's
  	
-PDEPEND="3dfx? ( >=media-libs/glide-v3-3.10 )"
+PDEPEND="x11-terms/xterm
+	3dfx? ( >=media-libs/glide-v3-3.10 )"
 
 PROVIDE="virtual/x11
 	virtual/opengl