4.2.99.3-r2 -- updated snapshot

21 files changed, 53 insertions, 45 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index e4392bf688d3..523ffbf90f9b 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,42 +1,16 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.83 2003/01/15 14:08:46 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.84 2003/01/16 15:54:17 seemant Exp $
 
-  15 Jan 2002; Mark Guertin <gerk@gentoo.org> xfree-4.2.1-r2.ebuild :
-  Removed patch 082 as it was the one breaking keycodes, set ppc in 
-  keywords. See bug #13073
-
-  11 Jan 2003; Jack Morgan <jmorgan@gentoo.org> xfree-4.2.1-r2.ebuild :
-  Changed sparc back to -sparc as it breakes keymaps
-
-  09 Jan 2003; Jack Morgan <jmorgan@gentoo.org> xfree-4.2.1-r2.ebuild :
-  Changed ~sparc to sparc
+*xfree-4.2.99.3-r2 (16 Jan 2003)
 
-  28 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild :
-  XFree86 do not like CFLAGS="-Os", filter for this, bug #12775.
-
-  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild :
-  Mark stable for x86.
+  16 Jan 2002; Seemant Kulleen <seemant@gentoo.org> xfree-4.2.99.3-r2.ebuild
+  files/digest-xfree-4.2.99.3-r2 files/4.2.99.3-r2/* :
 
-  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> 10xfree :
-  Add CONFIG_PROTECT=/usr/X11R6/lib/X11/xkb in the hopes to fix bug #6862.
-
-  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfs.start, xfs.config,
-                                                    Xsession :
+  new ebuild for updated snapshot.  this seems to be frozen code for the
+  X_4_2_99_3 branch.
 
-  Changes to xfs.start of xfree-4.2.1-r2:
-  - Update to that of xfree-4.2.99.3-r1 where we only run fc-cache if
-    something changed.
-  Changes to xfs.start of xfree-4.2.1-r2 and xfree-4.2.99.3-r1:
-  - Replace some code for xfs.start with awk versions to increase speed.
-  - Fix a bug where it did not drop duplicate font directories.
-  - Also consider changes to fonts.scale and encodings.dir as reason to
-    re-index that font directory.
-  Changes to xfs.config of xfree-4.2.1-r2 and xfree-4.2.99.3-r1:
-  - Remove a duplicate font directory entry.
-  Changes to Xsession of xfree-4.2.1-r2 and xfree-4.2.99.3-r1:
-  - Change the shell to '/bin/bash --login' to at least for xdm fix
-    the environment problem.
+*xfree-4.2.99.3-r1 (23 Dec 2002)
 
   24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild,
                                                     xfree-4.2.99.3-r1.ebuild :
@@ -54,8 +28,6 @@
   Fix check for $DEBUGBUILD to test for "yes" and not "true",
   fixing bug #12572.
 
-*xfree-4.2.99.3-r1 (23 Dec 2002)
-
   23 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.99.3-r1.ebuild :
   Some form fixes.  Added some patches back in, although I should verify some
   of the left out ones.  Fix to not build Xft2.0 and fontconfig .. we rather
@@ -78,6 +50,42 @@
  
 *xfree-4.2.1-r2 (05 Dec 2002)
 
+  15 Jan 2002; Mark Guertin <gerk@gentoo.org> xfree-4.2.1-r2.ebuild :
+  Removed patch 082 as it was the one breaking keycodes, set ppc in 
+  keywords. See bug #13073
+
+  11 Jan 2003; Jack Morgan <jmorgan@gentoo.org> xfree-4.2.1-r2.ebuild :
+  Changed sparc back to -sparc as it breakes keymaps
+
+  09 Jan 2003; Jack Morgan <jmorgan@gentoo.org> xfree-4.2.1-r2.ebuild :
+  Changed ~sparc to sparc
+
+  28 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild :
+  XFree86 do not like CFLAGS="-Os", filter for this, bug #12775.
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild :
+  Mark stable for x86.
+
+  26 Dec 2002; Martin Schlemmer <azarah@gentoo.org> 10xfree :
+  Add CONFIG_PROTECT=/usr/X11R6/lib/X11/xkb in the hopes to fix bug #6862.
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfs.start, xfs.config,
+                                                    Xsession :
+
+  Changes to xfs.start of xfree-4.2.1-r2:
+  - Update to that of xfree-4.2.99.3-r1 where we only run fc-cache if
+    something changed.
+  Changes to xfs.start of xfree-4.2.1-r2 and xfree-4.2.99.3-r1:
+  - Replace some code for xfs.start with awk versions to increase speed.
+  - Fix a bug where it did not drop duplicate font directories.
+  - Also consider changes to fonts.scale and encodings.dir as reason to
+    re-index that font directory.
+  Changes to xfs.config of xfree-4.2.1-r2 and xfree-4.2.99.3-r1:
+  - Remove a duplicate font directory entry.
+  Changes to Xsession of xfree-4.2.1-r2 and xfree-4.2.99.3-r1:
+  - Change the shell to '/bin/bash --login' to at least for xdm fix
+    the environment problem.
+
   05 Dec 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r2.ebuild :
   Basically cleanup 4.2.1-r1.
   - Resolve bug #10624 (Updated trident patch).
diff --git a/x11-base/xfree/files/4.2.99.3-r1/10xfree b/x11-base/xfree/files/4.2.99.3-r2/10xfree
index 4dba95e6bd68..4dba95e6bd68 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/10xfree
+++ b/x11-base/xfree/files/4.2.99.3-r2/10xfree
diff --git a/x11-base/xfree/files/4.2.99.3-r1/Sessions/Xsession b/x11-base/xfree/files/4.2.99.3-r2/Sessions/Xsession
index c86ccee19ff3..c86ccee19ff3 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/Sessions/Xsession
+++ b/x11-base/xfree/files/4.2.99.3-r2/Sessions/Xsession
diff --git a/x11-base/xfree/files/4.2.99.3-r1/XftConfig b/x11-base/xfree/files/4.2.99.3-r2/XftConfig
index 352757a1ce64..352757a1ce64 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/XftConfig
+++ b/x11-base/xfree/files/4.2.99.3-r2/XftConfig
diff --git a/x11-base/xfree/files/4.2.99.3-r1/Xsession b/x11-base/xfree/files/4.2.99.3-r2/Xsession
index ffeef4c87420..ffeef4c87420 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/Xsession
+++ b/x11-base/xfree/files/4.2.99.3-r2/Xsession
diff --git a/x11-base/xfree/files/4.2.99.3-r1/Xsetup_0 b/x11-base/xfree/files/4.2.99.3-r2/Xsetup_0
index 2022592bb146..2022592bb146 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/Xsetup_0
+++ b/x11-base/xfree/files/4.2.99.3-r2/Xsetup_0
diff --git a/x11-base/xfree/files/4.2.99.3-r1/chooser.sh b/x11-base/xfree/files/4.2.99.3-r2/chooser.sh
index 8ee9b8434de8..b8f44d880e0b 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/chooser.sh
+++ b/x11-base/xfree/files/4.2.99.3-r2/chooser.sh
@@ -2,7 +2,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r1/chooser.sh,v 1.1 2002/12/23 04:52:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r2/chooser.sh,v 1.1 2003/01/16 15:54:17 seemant Exp $
 
 # If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf
 if [ -z "${XSESSION}" ]
diff --git a/x11-base/xfree/files/4.2.99.3-r1/lib/libGL.la b/x11-base/xfree/files/4.2.99.3-r2/lib/libGL.la
index 8566b67d4c3d..8566b67d4c3d 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/lib/libGL.la
+++ b/x11-base/xfree/files/4.2.99.3-r2/lib/libGL.la
diff --git a/x11-base/xfree/files/4.2.99.3-r1/lib/libGLU.la b/x11-base/xfree/files/4.2.99.3-r2/lib/libGLU.la
index 86b6432cf5db..86b6432cf5db 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/lib/libGLU.la
+++ b/x11-base/xfree/files/4.2.99.3-r2/lib/libGLU.la
diff --git a/x11-base/xfree/files/4.2.99.3-r1/lib/libOSMesa.la b/x11-base/xfree/files/4.2.99.3-r2/lib/libOSMesa.la
index 56a72ed91f02..56a72ed91f02 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/lib/libOSMesa.la
+++ b/x11-base/xfree/files/4.2.99.3-r2/lib/libOSMesa.la
diff --git a/x11-base/xfree/files/4.2.99.3-r1/site.def b/x11-base/xfree/files/4.2.99.3-r2/site.def
index 9338bf46c273..9338bf46c273 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/site.def
+++ b/x11-base/xfree/files/4.2.99.3-r2/site.def
diff --git a/x11-base/xfree/files/4.2.99.3-r1/startDM.sh b/x11-base/xfree/files/4.2.99.3-r2/startDM.sh
index 9ba7690fe317..45acdc8883ca 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/startDM.sh
+++ b/x11-base/xfree/files/4.2.99.3-r2/startDM.sh
@@ -2,7 +2,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r1/startDM.sh,v 1.3 2002/12/26 03:29:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r2/startDM.sh,v 1.1 2003/01/16 15:54:17 seemant Exp $
 
 source /etc/init.d/functions.sh
 
diff --git a/x11-base/xfree/files/4.2.99.3-r1/xdm.pamd b/x11-base/xfree/files/4.2.99.3-r2/xdm.pamd
index 1d2e081625f1..1d2e081625f1 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/xdm.pamd
+++ b/x11-base/xfree/files/4.2.99.3-r2/xdm.pamd
diff --git a/x11-base/xfree/files/4.2.99.3-r1/xdm.start b/x11-base/xfree/files/4.2.99.3-r2/xdm.start
index a8cdddf193b2..83567c5799b1 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/xdm.start
+++ b/x11-base/xfree/files/4.2.99.3-r2/xdm.start
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r1/xdm.start,v 1.1 2002/12/23 04:52:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r2/xdm.start,v 1.1 2003/01/16 15:54:17 seemant Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
diff --git a/x11-base/xfree/files/4.2.99.3-r1/xfs.conf.d b/x11-base/xfree/files/4.2.99.3-r2/xfs.conf.d
index b163d618b180..50705e6f03fc 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/xfs.conf.d
+++ b/x11-base/xfree/files/4.2.99.3-r2/xfs.conf.d
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r1/xfs.conf.d,v 1.1 2002/12/23 04:52:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r2/xfs.conf.d,v 1.1 2003/01/16 15:54:17 seemant Exp $
 
 # Config file for /etc/init.d/xfs
 
diff --git a/x11-base/xfree/files/4.2.99.3-r1/xfs.config b/x11-base/xfree/files/4.2.99.3-r2/xfs.config
index e594a25183eb..e594a25183eb 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/xfs.config
+++ b/x11-base/xfree/files/4.2.99.3-r2/xfs.config
diff --git a/x11-base/xfree/files/4.2.99.3-r1/xfs.start b/x11-base/xfree/files/4.2.99.3-r2/xfs.start
index aac04614ca9b..af45142262eb 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/xfs.start
+++ b/x11-base/xfree/files/4.2.99.3-r2/xfs.start
@@ -2,7 +2,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r1/xfs.start,v 1.3 2002/12/25 18:51:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.99.3-r2/xfs.start,v 1.1 2003/01/16 15:54:17 seemant Exp $
 
 #NB: Config is in /etc/conf.d/xfs
 
diff --git a/x11-base/xfree/files/4.2.99.3-r1/xinitrc b/x11-base/xfree/files/4.2.99.3-r2/xinitrc
index 53cde32559d2..53cde32559d2 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/xinitrc
+++ b/x11-base/xfree/files/4.2.99.3-r2/xinitrc
diff --git a/x11-base/xfree/files/4.2.99.3-r1/xserver.pamd b/x11-base/xfree/files/4.2.99.3-r2/xserver.pamd
index 7ff11c4329e2..7ff11c4329e2 100644
--- a/x11-base/xfree/files/4.2.99.3-r1/xserver.pamd
+++ b/x11-base/xfree/files/4.2.99.3-r2/xserver.pamd
diff --git a/x11-base/xfree/files/digest-xfree-4.2.99.3-r1 b/x11-base/xfree/files/digest-xfree-4.2.99.3-r2
index 6dd43d19e04a..15af6e8583c1 100644
--- a/x11-base/xfree/files/digest-xfree-4.2.99.3-r1
+++ b/x11-base/xfree/files/digest-xfree-4.2.99.3-r2
@@ -1,7 +1,7 @@
-MD5 20ce3e8ad190ad8ae9aecc18cf168249 X4.2.99.3-1.tar.bz2 16691905
-MD5 a70af970c95a9ec30365bc8ac8fb663f X4.2.99.3-2.tar.bz2 9770253
-MD5 e0751934436f3679b128673aad663afc X4.2.99.3-3.tar.bz2 12774830
-MD5 50dea4abe59a09da7fc1b83f88b9303b X4.2.99.3-4.tar.bz2 16700555
+MD5 967bf4e2454188f72902b7625ae83c47 X4.2.99.3-1.tar.bz2 16712994
+MD5 4ad8d83f5b04be1a0a01031719e98abc X4.2.99.3-2.tar.bz2 9771956
+MD5 9c3c99e847cb0d57360ea9014b02c700 X4.2.99.3-3.tar.bz2 12810751
+MD5 a4d5d346a3ffc6eb5303124c1a867820 X4.2.99.3-4.tar.bz2 16700780
 MD5 4ecbe985e304445695dc82af0a532988 XFree86-4.2.99.3-patches-1.1.tar.bz2 232640
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 5511a37ede0f6561c2dad26634b42e87 savage-1.1.26t.tgz 69707
diff --git a/x11-base/xfree/xfree-4.2.99.3-r1.ebuild b/x11-base/xfree/xfree-4.2.99.3-r2.ebuild
index 9f12ab300123..4cfc471585c2 100644
--- a/x11-base/xfree/xfree-4.2.99.3-r1.ebuild
+++ b/x11-base/xfree/xfree-4.2.99.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.3-r1.ebuild,v 1.6 2003/01/03 19:06:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.3-r2.ebuild,v 1.1 2003/01/16 15:54:17 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 ...