Pull old versions.

(Portage version: 2.0.51.22-r2)

10 files changed, 7 insertions, 918 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 516f58a27cb1..cff7ac3effff 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.31 2005/08/20 19:57:52 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.32 2005/08/22 03:39:25 spyderous Exp $
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/fix-include-locations.patch, -files/fix-xthreads-location.patch,
+  -files/use-xthreads.patch, -mesa-6.3.1.1.ebuild, -mesa-6.3.1.1-r1.ebuild,
+  -mesa-6.3.1.1-r2.ebuild:
+  Pull old versions.
 
   20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   mesa-6.3.1.1-r3.ebuild:
diff --git a/media-libs/mesa/files/digest-mesa-6.3.1.1 b/media-libs/mesa/files/digest-mesa-6.3.1.1
deleted file mode 100644
index fd2bb869cadf..000000000000
--- a/media-libs/mesa/files/digest-mesa-6.3.1.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
-MD5 34cdd11cc3d1786754439c7910d8cb38 libdrm-1.0.1.tar.gz 396571
diff --git a/media-libs/mesa/files/digest-mesa-6.3.1.1-r1 b/media-libs/mesa/files/digest-mesa-6.3.1.1-r1
deleted file mode 100644
index c061afc4f2ea..000000000000
--- a/media-libs/mesa/files/digest-mesa-6.3.1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
-MD5 34cdd11cc3d1786754439c7910d8cb38 libdrm-1.0.1.tar.gz 396571
-MD5 d48d25b86303ac5a58478bd5ccde6705 Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch.gz 147868
diff --git a/media-libs/mesa/files/digest-mesa-6.3.1.1-r2 b/media-libs/mesa/files/digest-mesa-6.3.1.1-r2
deleted file mode 100644
index c061afc4f2ea..000000000000
--- a/media-libs/mesa/files/digest-mesa-6.3.1.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
-MD5 34cdd11cc3d1786754439c7910d8cb38 libdrm-1.0.1.tar.gz 396571
-MD5 d48d25b86303ac5a58478bd5ccde6705 Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch.gz 147868
diff --git a/media-libs/mesa/files/fix-include-locations.patch b/media-libs/mesa/files/fix-include-locations.patch
deleted file mode 100644
index 4498e5475a12..000000000000
--- a/media-libs/mesa/files/fix-include-locations.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -urN Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c Mesa-6.3.1.1/src/glx/x11/dri_glx.c
---- Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c	2005-07-27 17:29:51.000000000 -0700
-+++ Mesa-6.3.1.1/src/glx/x11/dri_glx.c	2005-08-10 15:26:15.000000000 -0700
-@@ -38,7 +38,7 @@
- #include <unistd.h>
- #include <X11/Xlibint.h>
- #include <X11/extensions/Xext.h>
--#include "extutil.h"
-+#include <X11/extensions/extutil.h>
- #include "glxclient.h"
- #include "xf86dri.h"
- #include "sarea.h"
-diff -urN Mesa-6.3.1.1.orig/src/glx/x11/glxcmds.c Mesa-6.3.1.1/src/glx/x11/glxcmds.c
---- Mesa-6.3.1.1.orig/src/glx/x11/glxcmds.c	2005-07-27 17:29:51.000000000 -0700
-+++ Mesa-6.3.1.1/src/glx/x11/glxcmds.c	2005-08-10 15:31:21.000000000 -0700
-@@ -41,14 +41,14 @@
- 
- #include <inttypes.h>
- #include "glxclient.h"
--#include <extutil.h>
--#include <Xext.h>
-+#include <X11/extensions/extutil.h>
-+#include <X11/extensions/Xext.h>
- #include <assert.h>
- #include <string.h>
- #include "glapi.h"
- #ifdef GLX_DIRECT_RENDERING
- #include "indirect_init.h"
--#include "xf86vmode.h"
-+#include <X11/extensions/xf86vmode.h>
- #include "xf86dri.h"
- #endif
- #include "glxextensions.h"
-diff -urN Mesa-6.3.1.1.orig/src/glx/x11/glxext.c Mesa-6.3.1.1/src/glx/x11/glxext.c
---- Mesa-6.3.1.1.orig/src/glx/x11/glxext.c	2005-07-26 15:53:38.000000000 -0700
-+++ Mesa-6.3.1.1/src/glx/x11/glxext.c	2005-08-10 15:30:01.000000000 -0700
-@@ -46,8 +46,8 @@
- 
- #include "glxclient.h"
- #include <stdio.h>
--#include <Xext.h>
--#include <extutil.h>
-+#include <X11/extensions/Xext.h>
-+#include <X11/extensions/extutil.h>
- #include <assert.h>
- #include "indirect_init.h"
- #include "glapi.h"
-diff -urN Mesa-6.3.1.1.orig/src/glx/x11/glxextensions.c Mesa-6.3.1.1/src/glx/x11/glxextensions.c
---- Mesa-6.3.1.1.orig/src/glx/x11/glxextensions.c	2005-07-23 23:29:14.000000000 -0700
-+++ Mesa-6.3.1.1/src/glx/x11/glxextensions.c	2005-08-10 15:30:13.000000000 -0700
-@@ -29,8 +29,8 @@
-  */
- 
- #include "glxclient.h"
--#include <extutil.h>
--#include <Xext.h>
-+#include <X11/extensions/extutil.h>
-+#include <X11/extensions/Xext.h>
- #include <string.h>
- #include "glapi.h"
- #include "glxextensions.h"
-diff -urN Mesa-6.3.1.1.orig/src/glx/x11/glx_pbuffer.c Mesa-6.3.1.1/src/glx/x11/glx_pbuffer.c
---- Mesa-6.3.1.1.orig/src/glx/x11/glx_pbuffer.c	2005-07-26 15:53:38.000000000 -0700
-+++ Mesa-6.3.1.1/src/glx/x11/glx_pbuffer.c	2005-08-10 15:28:05.000000000 -0700
-@@ -31,8 +31,8 @@
- 
- #include <inttypes.h>
- #include "glxclient.h"
--#include <extutil.h>
--#include <Xext.h>
-+#include <X11/extensions/extutil.h>
-+#include <X11/extensions/Xext.h>
- #include <assert.h>
- #include <string.h>
- #include "glapi.h"
-diff -urN Mesa-6.3.1.1.orig/src/glx/x11/XF86dri.c Mesa-6.3.1.1/src/glx/x11/XF86dri.c
---- Mesa-6.3.1.1.orig/src/glx/x11/XF86dri.c	2005-01-07 19:54:38.000000000 -0800
-+++ Mesa-6.3.1.1/src/glx/x11/XF86dri.c	2005-08-10 15:27:21.000000000 -0700
-@@ -40,7 +40,7 @@
- #define NEED_REPLIES
- #include <X11/Xlibint.h>
- #include <X11/extensions/Xext.h>
--#include "extutil.h"
-+#include <X11/extensions/extutil.h>
- #include "glheader.h"
- #include "xf86dristr.h"
- 
diff --git a/media-libs/mesa/files/fix-xthreads-location.patch b/media-libs/mesa/files/fix-xthreads-location.patch
deleted file mode 100644
index f5b3664c4017..000000000000
--- a/media-libs/mesa/files/fix-xthreads-location.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-CVSROOT:	/cvs/mesa
-Module name:	Mesa
-Repository:	Mesa/src/glx/x11/
-Changes by:	idr@gabe.	05/08/01 09:30:24
-
-Log message:
-  Fix build problems related to finding Xthreads.h.
-
-Modified files:
-      Mesa/src/glx/x11/:
-        glxclient.h glxext.c 
-  
-  Revision      Changes    Path
-  1.12          +1 -1      Mesa/src/glx/x11/glxclient.h
-  http://cvs.freedesktop.org/mesa/Mesa/src/glx/x11/glxclient.h
-  1.15          +0 -5      Mesa/src/glx/x11/glxext.c
-  http://cvs.freedesktop.org/mesa/Mesa/src/glx/x11/glxext.c
-
-Index: src/glx/x11/glxclient.h
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxclient.h,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -b -B -r1.11 -r1.12
---- Mesa-6.3.1.1/src/glx/x11/glxclient.h	29 Jul 2005 17:30:18 -0000	1.11
-+++ Mesa-6.3.1.1/src/glx/x11/glxclient.h	1 Aug 2005 16:30:24 -0000	1.12
-@@ -61,7 +61,7 @@
- #include "glapitable.h"
- #include "glxextensions.h"
- #if defined( XTHREADS )
--# include "Xthreads.h"
-+# include <X11/Xthreads.h>
- #elif defined( PTHREADS )
- # include <pthread.h>
- #endif
-Index: src/glx/x11/glxext.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v
-retrieving revision 1.14
-retrieving revision 1.15
-diff -u -b -B -r1.14 -r1.15
---- Mesa-6.3.1.1/src/glx/x11/glxext.c	26 Jul 2005 22:53:38 -0000	1.14
-+++ Mesa-6.3.1.1/src/glx/x11/glxext.c	1 Aug 2005 16:30:24 -0000	1.15
-@@ -51,11 +51,6 @@
- #include <assert.h>
- #include "indirect_init.h"
- #include "glapi.h"
--#ifdef XTHREADS
--# include "Xthreads.h"
--#elif defined(PTHREADS)
--# include <pthread.h>
--#endif
- #include "glxextensions.h"
- #include "glcontextmodes.h"
- #include "glheader.h"
diff --git a/media-libs/mesa/files/use-xthreads.patch b/media-libs/mesa/files/use-xthreads.patch
deleted file mode 100644
index 5d595eccc776..000000000000
--- a/media-libs/mesa/files/use-xthreads.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-CVSROOT:	/cvs/mesa
-Module name:	Mesa
-Repository:	Mesa/src/mesa/x86-64/
-Changes by:	idr@gabe.	05/08/03 16:05:26
-
-Log message:
-  Convert all instances of XTHREADS to USE_XTHREADS.  This fixes one of
-  serveral things that are broken when building on a system with X.org 7.0rc0
-  installed.
-
-Modified files:
-      Mesa/src/glx/x11/:
-        glxclient.h glxext.c 
-      Mesa/src/mesa/x86/:
-        glapi_x86.S 
-      Mesa/src/mesa/glapi/:
-        gl_x86-64_asm.py gl_x86_asm.py glthread.c glthread.h 
-      Mesa/src/mesa/x86-64/:
-        glapi_x86-64.S 
-  
-  Revision      Changes    Path
-  1.13          +4 -4      Mesa/src/glx/x11/glxclient.h
-  http://cvs.freedesktop.org/mesa/Mesa/src/glx/x11/glxclient.h
-  1.16          +2 -2      Mesa/src/glx/x11/glxext.c
-  http://cvs.freedesktop.org/mesa/Mesa/src/glx/x11/glxext.c
-  1.55          +1 -1      Mesa/src/mesa/x86/glapi_x86.S
-  http://cvs.freedesktop.org/mesa/Mesa/src/mesa/x86/glapi_x86.S
-  1.2           +1 -1      Mesa/src/mesa/glapi/gl_x86-64_asm.py
-  http://cvs.freedesktop.org/mesa/Mesa/src/mesa/glapi/gl_x86-64_asm.py
-  1.14          +1 -1      Mesa/src/mesa/glapi/gl_x86_asm.py
-  http://cvs.freedesktop.org/mesa/Mesa/src/mesa/glapi/gl_x86_asm.py
-  1.12          +1 -1      Mesa/src/mesa/glapi/glthread.c
-  http://cvs.freedesktop.org/mesa/Mesa/src/mesa/glapi/glthread.c
-  1.21          +3 -3      Mesa/src/mesa/glapi/glthread.h
-  http://cvs.freedesktop.org/mesa/Mesa/src/mesa/glapi/glthread.h
-  1.2           +1 -1      Mesa/src/mesa/x86-64/glapi_x86-64.S
-  http://cvs.freedesktop.org/mesa/Mesa/src/mesa/x86-64/glapi_x86-64.S
-
-Index: src/glx/x11/glxclient.h
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxclient.h,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -b -B -r1.12 -r1.13
---- Mesa-6.3.1.1/src/glx/x11/glxclient.h	1 Aug 2005 16:30:24 -0000	1.12
-+++ Mesa-6.3.1.1/src/glx/x11/glxclient.h	3 Aug 2005 23:05:25 -0000	1.13
-@@ -60,7 +60,7 @@
- #include "GL/internal/glcore.h"
- #include "glapitable.h"
- #include "glxextensions.h"
--#if defined( XTHREADS )
-+#if defined( USE_XTHREADS )
- # include <X11/Xthreads.h>
- #elif defined( PTHREADS )
- # include <pthread.h>
-@@ -547,7 +547,7 @@
- extern int __glXDebug;
- 
- /* This is per-thread storage in an MT environment */
--#if defined( XTHREADS ) || defined( PTHREADS )
-+#if defined( USE_XTHREADS ) || defined( PTHREADS )
- 
- extern void __glXSetCurrentContext(__GLXcontext *c);
- 
-@@ -570,14 +570,14 @@
- #define __glXGetCurrentContext()	__glXcurrentContext
- #define __glXSetCurrentContext(gc)	__glXcurrentContext = gc
- 
--#endif /* defined( XTHREADS ) || defined( PTHREADS ) */
-+#endif /* defined( USE_XTHREADS ) || defined( PTHREADS ) */
- 
- 
- /*
- ** Global lock for all threads in this address space using the GLX
- ** extension
- */
--#if defined( XTHREADS )
-+#if defined( USE_XTHREADS )
- extern xmutex_rec __glXmutex;
- #define __glXLock()    xmutex_lock(&__glXmutex)
- #define __glXUnlock()  xmutex_unlock(&__glXmutex)
-Index: src/glx/x11/glxext.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v
-retrieving revision 1.15
-retrieving revision 1.16
-diff -u -b -B -r1.15 -r1.16
---- Mesa-6.3.1.1/src/glx/x11/glxext.c	1 Aug 2005 16:30:24 -0000	1.15
-+++ Mesa-6.3.1.1/src/glx/x11/glxext.c	3 Aug 2005 23:05:25 -0000	1.16
-@@ -145,7 +145,7 @@
-  * Current context management and locking
-  */
- 
--#if defined( XTHREADS )
-+#if defined( USE_XTHREADS )
- 
- /* thread safe */
- static GLboolean TSDinitialized = GL_FALSE;
-@@ -1106,7 +1106,7 @@
-     XEDataObject dataObj;
-     int major, minor;
- 
--#if defined(XTHREADS)
-+#if defined(USE_XTHREADS)
-     {
-         static int firstCall = 1;
-         if (firstCall) {
-Index: src/mesa/glapi/gl_x86-64_asm.py
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/glapi/gl_x86-64_asm.py,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -b -B -r1.1 -r1.2
---- Mesa-6.3.1.1/src/mesa/glapi/gl_x86-64_asm.py	2 Jul 2005 08:29:58 -0000	1.1
-+++ Mesa-6.3.1.1/src/mesa/glapi/gl_x86-64_asm.py	3 Aug 2005 23:05:25 -0000	1.2
-@@ -127,7 +127,7 @@
- 		print '#  define HIDDEN(x)'
- 		print '#endif'
- 		print ''
--		print '#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
-+		print '#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
- 		print '#  define THREADS'
- 		print '#endif'
- 		print ''
-Index: src/mesa/glapi/gl_x86_asm.py
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/glapi/gl_x86_asm.py,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -b -B -r1.13 -r1.14
---- Mesa-6.3.1.1/src/mesa/glapi/gl_x86_asm.py	21 Jun 2005 23:42:44 -0000	1.13
-+++ Mesa-6.3.1.1/src/mesa/glapi/gl_x86_asm.py	3 Aug 2005 23:05:25 -0000	1.14
-@@ -86,7 +86,7 @@
- 		print '#define GLOBL_FN(x) GLOBL x'
- 		print '#endif'
- 		print ''
--		print '#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
-+		print '#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)'
- 		print '#  define THREADS'
- 		print '#endif'
- 		print ''
-Index: src/mesa/glapi/glthread.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/glapi/glthread.c,v
-retrieving revision 1.11
-retrieving revision 1.12
-diff -u -b -B -r1.11 -r1.12
---- Mesa-6.3.1.1/src/mesa/glapi/glthread.c	5 Jun 2003 00:50:40 -0000	1.11
-+++ Mesa-6.3.1.1/src/mesa/glapi/glthread.c	3 Aug 2005 23:05:25 -0000	1.12
-@@ -242,7 +242,7 @@
-  * XFree86 has its own thread wrapper, Xthreads.h
-  * We wrap it again for GL.
-  */
--#ifdef XTHREADS
-+#ifdef USE_XTHREADS
- 
- unsigned long
- _glthread_GetID(void)
-Index: src/mesa/glapi/glthread.h
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/glapi/glthread.h,v
-retrieving revision 1.20
-retrieving revision 1.21
-diff -u -b -B -r1.20 -r1.21
---- Mesa-6.3.1.1/src/mesa/glapi/glthread.h	18 Jul 2005 12:31:26 -0000	1.20
-+++ Mesa-6.3.1.1/src/mesa/glapi/glthread.h	3 Aug 2005 23:05:25 -0000	1.21
-@@ -65,7 +65,7 @@
- 
- 
- #if (defined(PTHREADS) || defined(SOLARIS_THREADS) ||\
--     defined(WIN32_THREADS) || defined(XTHREADS) || defined(BEOS_THREADS)) \
-+     defined(WIN32_THREADS) || defined(USE_XTHREADS) || defined(BEOS_THREADS)) \
-     && !defined(THREADS)
- # define THREADS
- #endif
-@@ -193,7 +193,7 @@
-  * XFree86 has its own thread wrapper, Xthreads.h
-  * We wrap it again for GL.
-  */
--#ifdef XTHREADS
-+#ifdef USE_XTHREADS
- #include <X11/Xthreads.h>
- 
- typedef struct {
-@@ -225,7 +225,7 @@
- #define _glthread_UNLOCK_MUTEX(name) \
-    (void) xmutex_unlock(&(name))
- 
--#endif /* XTHREADS */
-+#endif /* USE_XTHREADS */
- 
- 
- 
-Index: src/mesa/x86/glapi_x86.S
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/x86/glapi_x86.S,v
-retrieving revision 1.54
-retrieving revision 1.55
-diff -u -b -B -r1.54 -r1.55
---- Mesa-6.3.1.1/src/mesa/x86/glapi_x86.S	21 Jun 2005 23:42:44 -0000	1.54
-+++ Mesa-6.3.1.1/src/mesa/x86/glapi_x86.S	3 Aug 2005 23:05:25 -0000	1.55
-@@ -63,7 +63,7 @@
- #define GLOBL_FN(x) GLOBL x
- #endif
- 
--#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
-+#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
- #  define THREADS
- #endif
- 
-Index: src/mesa/x86-64/glapi_x86-64.S
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/glapi_x86-64.S,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -b -B -r1.1 -r1.2
---- Mesa-6.3.1.1/src/mesa/x86-64/glapi_x86-64.S	2 Jul 2005 08:29:58 -0000	1.1
-+++ Mesa-6.3.1.1/src/mesa/x86-64/glapi_x86-64.S	3 Aug 2005 23:05:25 -0000	1.2
-@@ -35,7 +35,7 @@
- #  define HIDDEN(x)
- #endif
- 
--#if defined(PTHREADS) || defined(XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
-+#if defined(PTHREADS) || defined(USE_XTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(BEOS_THREADS)
- #  define THREADS
- #endif
- 
diff --git a/media-libs/mesa/mesa-6.3.1.1-r1.ebuild b/media-libs/mesa/mesa-6.3.1.1-r1.ebuild
deleted file mode 100644
index 9b1ec9db399f..000000000000
--- a/media-libs/mesa/mesa-6.3.1.1-r1.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1-r1.ebuild,v 1.1 2005/08/12 22:13:08 spyderous Exp $
-
-inherit eutils toolchain-funcs
-
-OPENGL_DIR="xorg-x11"
-
-LIBDRM_PV="1.0.1"
-LIBDRM_P="libdrm-${LIBDRM_PV}"
-
-MY_PN=${PN/m/M}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="http://xorg.freedesktop.org/extras/${MY_P}.tar.gz
-	http://xorg.freedesktop.org/extras/${LIBDRM_P}.tar.gz
-	http://dev.gentoo.org/~spyderous/xorg-x11/Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~sparc ~x86"
-IUSE="motif"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-base/opengl-update-2.2.2
-	motif? ( virtual/motif )"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	>=x11-proto/glproto-1.4-r1"
-
-PROVIDE="virtual/opengl virtual/glu"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-pkg_setup() {
-	if use x86; then
-		CONFIG="linux-dri-x86"
-	# amd64 people need to look at this file to deal with lib64 issues, unless
-	# they're fine with hardcoded lib64.
-	elif use amd64; then
-		CONFIG="linux-dri-x86-64"
-	elif use ppc; then
-		CONFIG="linux-dri-ppc"
-	else
-		CONFIG="linux-dri"
-	fi
-}
-
-src_unpack() {
-	HOSTCONF="${S}/configs/${CONFIG}"
-
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch
-#	epatch ${FILESDIR}/fix-xthreads-location.patch
-#	epatch ${FILESDIR}/use-xthreads.patch
-	epatch ${FILESDIR}/makedepend-location.patch
-#	epatch ${FILESDIR}/fix-include-locations.patch
-
-	# Set up linux-dri configs
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	if use sparc; then
-		# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
-		# build.
-		echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
-		einfo "Define the sparc DRI drivers."
-		echo "DRI_DIRS = dri_client ffb mach64 mga radeon savage" >> ${HOSTCONF}
-		einfo "Explicitly note that sparc assembly code is not working."
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-	fi
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
-	echo "DRM_SOURCE_PATH=\$(TOP)/../${LIBDRM_P}" >> ${HOSTCONF}
-
-	# Removed glut, since we have separate freeglut/glut ebuilds
-	echo "SRC_DIRS = egl glx/x11 mesa glu glw" >> ${HOSTCONF}
-
-	# Documented in configs/default
-	if use motif; then
-		# Add -lXm
-#		echo "GLW_LIB_DEPS = -L\$(LIB_DIR) -l\$(GL_LIB) \$(EXTRA_LIB_PATH) -lXt -lX11 -lXm" >> ${HOSTCONF}
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
-		# Add GLwMDrawA.c
-#		echo "GLW_SOURCES = GLwDrawA.c GLwMDrawA.c" >> ${HOSTCONF}
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make DESTDIR=${D}/usr install || die "Installation failed"
-
-	##
-	# Install the actual drivers --- 'make install' doesn't install them
-	# anywhere.
-	dodir /usr/$(get_libdir)/xorg/modules/dri
-	exeinto /usr/$(get_libdir)/xorg/modules/dri
-	einfo "Installing drivers to ${EXEDESTTREE}."
-	find ${S}/lib -name '*_dri.so' | xargs doexe
-
-	fix_opengl_symlinks
-	dynamic_libgl_install
-
-	# Install libtool archives
-	insinto /usr/$(get_libdir)
-	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/*.la
-
-	# Create the two-number versioned libs (.so.#.#), since only .so.# and
-	# .so.#.#.# were made
-	dosym libGLU.so.1.3.060301 /usr/lib/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/lib/libGLw.so.1.0
-	dosym libOSMesa.so.6.3.060301 /usr/lib/libOSMesa.so.6.3
-
-	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
-	# as the default libGL.so.1
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
-			fi
-		done
-		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
-}
diff --git a/media-libs/mesa/mesa-6.3.1.1-r2.ebuild b/media-libs/mesa/mesa-6.3.1.1-r2.ebuild
deleted file mode 100644
index 7f58e2dfffb4..000000000000
--- a/media-libs/mesa/mesa-6.3.1.1-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1-r2.ebuild,v 1.3 2005/08/15 20:41:47 herbs Exp $
-
-inherit eutils toolchain-funcs multilib
-
-OPENGL_DIR="xorg-x11"
-
-LIBDRM_PV="1.0.1"
-LIBDRM_P="libdrm-${LIBDRM_PV}"
-
-MY_PN=${PN/m/M}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="http://xorg.freedesktop.org/extras/${MY_P}.tar.gz
-	http://xorg.freedesktop.org/extras/${LIBDRM_P}.tar.gz
-	http://dev.gentoo.org/~spyderous/xorg-x11/Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="motif"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-base/opengl-update-2.2.2
-	motif? ( virtual/motif )"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	>=x11-proto/glproto-1.4-r1"
-
-PROVIDE="virtual/opengl virtual/glu"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-pkg_setup() {
-	if use x86; then
-		CONFIG="linux-dri-x86"
-	# amd64 people need to look at this file to deal with lib64 issues, unless
-	# they're fine with hardcoded lib64.
-	elif use amd64; then
-		CONFIG="linux-dri-x86-64"
-	elif use ppc; then
-		CONFIG="linux-dri-ppc"
-	else
-		CONFIG="linux-dri"
-	fi
-}
-
-src_unpack() {
-	HOSTCONF="${S}/configs/${CONFIG}"
-
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch
-#	epatch ${FILESDIR}/fix-xthreads-location.patch
-#	epatch ${FILESDIR}/use-xthreads.patch
-	epatch ${FILESDIR}/makedepend-location.patch
-#	epatch ${FILESDIR}/fix-include-locations.patch
-	epatch ${FILESDIR}/dont-install-gles-headers.patch
-	epatch ${FILESDIR}/change-default-dri-driver-dir.patch
-
-	# Set up linux-dri configs
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	if use sparc; then
-		# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
-		# build.
-		echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
-		einfo "Define the sparc DRI drivers."
-		echo "DRI_DIRS = dri_client ffb mach64 mga radeon savage" >> ${HOSTCONF}
-		einfo "Explicitly note that sparc assembly code is not working."
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-	fi
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
-	echo "DRM_SOURCE_PATH=\$(TOP)/../${LIBDRM_P}" >> ${HOSTCONF}
-
-	# Removed glut, since we have separate freeglut/glut ebuilds
-	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
-
-	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
-	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
-
-	# Documented in configs/default
-	if use motif; then
-		# Add -lXm
-#		echo "GLW_LIB_DEPS = -L\$(LIB_DIR) -l\$(GL_LIB) \$(EXTRA_LIB_PATH) -lXt -lX11 -lXm" >> ${HOSTCONF}
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
-		# Add GLwMDrawA.c
-#		echo "GLW_SOURCES = GLwDrawA.c GLwMDrawA.c" >> ${HOSTCONF}
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
-	fi
-
-	# Fix install libdir
-	sed -i -e "s:LIB_DIR=\$1/lib:LIB_DIR=\$1/$(get_libdir):" \
-			${S}/bin/installmesa || die "sed failed"
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make DESTDIR=${D}/usr install || die "Installation failed"
-
-	##
-	# Install the actual drivers --- 'make install' doesn't install them
-	# anywhere.
-	dodir /usr/$(get_libdir)/xorg/modules/dri
-	exeinto /usr/$(get_libdir)/xorg/modules/dri
-	einfo "Installing drivers to ${EXEDESTTREE}."
-	find ${S}/lib* -name '*_dri.so' | xargs doexe
-
-	fix_opengl_symlinks
-	dynamic_libgl_install
-
-	# Install libtool archives
-	insinto /usr/$(get_libdir)
-	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la ${FILESDIR}/lib/libOSMesa.la
-	insinto /usr/$(get_libdir)/opengl/xorg-x11/lib
-	doins ${FILESDIR}/lib/libGL.la
-
-	# Create the two-number versioned libs (.so.#.#), since only .so.# and
-	# .so.#.#.# were made
-	dosym libGLU.so.1.3.060301 /usr/$(get_libdir)/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
-	dosym libOSMesa.so.6.3.060301 /usr/$(get_libdir)/libOSMesa.so.6.3
-
-	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
-	# as the default libGL.so.1
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
-			fi
-		done
-		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
-}
diff --git a/media-libs/mesa/mesa-6.3.1.1.ebuild b/media-libs/mesa/mesa-6.3.1.1.ebuild
deleted file mode 100644
index 0b3eefda633f..000000000000
--- a/media-libs/mesa/mesa-6.3.1.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1.ebuild,v 1.14 2005/08/12 18:53:50 spyderous Exp $
-
-inherit eutils toolchain-funcs
-
-OPENGL_DIR="xorg-x11"
-
-LIBDRM_PV="1.0.1"
-LIBDRM_P="libdrm-${LIBDRM_PV}"
-
-MY_PN=${PN/m/M}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="http://xorg.freedesktop.org/extras/${MY_P}.tar.gz
-	http://xorg.freedesktop.org/extras/${LIBDRM_P}.tar.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~sparc ~x86"
-IUSE="motif"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-base/opengl-update-2.2.2
-	motif? ( virtual/motif )"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	>=x11-proto/glproto-1.4-r1"
-
-PROVIDE="virtual/opengl virtual/glu"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-pkg_setup() {
-	if use x86; then
-		CONFIG="linux-dri-x86"
-	# amd64 people need to look at this file to deal with lib64 issues, unless
-	# they're fine with hardcoded lib64.
-	elif use amd64; then
-		CONFIG="linux-dri-x86-64"
-	elif use ppc; then
-		CONFIG="linux-dri-ppc"
-	else
-		CONFIG="linux-dri"
-	fi
-}
-
-src_unpack() {
-	HOSTCONF="${S}/configs/${CONFIG}"
-
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/fix-xthreads-location.patch
-	epatch ${FILESDIR}/use-xthreads.patch
-	epatch ${FILESDIR}/makedepend-location.patch
-	epatch ${FILESDIR}/fix-include-locations.patch
-
-	# Set up linux-dri configs
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	if use sparc; then
-		# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
-		# build.
-		echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
-		einfo "Define the sparc DRI drivers."
-		echo "DRI_DIRS = dri_client ffb mach64 mga radeon savage" >> ${HOSTCONF}
-		einfo "Explicitly note that sparc assembly code is not working."
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-	fi
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
-	echo "DRM_SOURCE_PATH=\$(TOP)/../${LIBDRM_P}" >> ${HOSTCONF}
-
-	# Removed glut, since we have separate freeglut/glut ebuilds
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
-
-	# Documented in configs/default
-	if use motif; then
-		# Add -lXm
-		echo "GLW_LIB_DEPS = -L\$(LIB_DIR) -l\$(GL_LIB) \$(EXTRA_LIB_PATH) -lXt -lX11 -lXm" >> ${HOSTCONF}
-		# Add GLwMDrawA.c
-		echo "GLW_SOURCES = GLwDrawA.c GLwMDrawA.c" >> ${HOSTCONF}
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make DESTDIR=${D}/usr install || die "Installation failed"
-
-	##
-	# Install the actual drivers --- 'make install' doesn't install them
-	# anywhere.
-	dodir /usr/$(get_libdir)/xorg/modules/dri
-	exeinto /usr/$(get_libdir)/xorg/modules/dri
-	einfo "Installing drivers to ${EXEDESTTREE}."
-	find ${S}/lib -name '*_dri.so' | xargs doexe
-
-	fix_opengl_symlinks
-	dynamic_libgl_install
-
-	# Install libtool archives
-	insinto /usr/$(get_libdir)
-	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/*.la
-
-	# Create the two-number versioned libs (.so.#.#), since only .so.# and
-	# .so.#.#.# were made
-	dosym libGLU.so.1.3.060301 /usr/lib/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/lib/libGLw.so.1.0
-	dosym libOSMesa.so.6.3.060301 /usr/lib/libOSMesa.so.6.3
-
-	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
-	# as the default libGL.so.1
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
-			fi
-		done
-		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
-		${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
-}