Clean out old versions.

(Portage version: 2.1.3.12)

16 files changed, 12 insertions, 2191 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index a4c7189c18ac..6e862394c90b 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.158 2007/10/09 08:23:57 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.159 2007/10/09 08:27:03 dberkholz Exp $
+
+  09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/6.4-multilib-fix.patch, -files/6.5.1-freebsd-dri.patch,
+  -files/6.5.1-xcb-dont-unlock-twice.patch,
+  -files/6.5-re-order-context-destruction.patch,
+  -files/6.5.1-mach64-dri-private-dma-2.patch,
+  -files/6.4-dont-install-gles-headers.patch,
+  -files/6.5.1-i965-bufmgr.patch, -files/6.5.1-use-new-xcb-naming.patch,
+  -files/change-default-dri-driver-dir-X7.1.patch, -mesa-6.5-r3.ebuild,
+  -mesa-6.5.1-r1.ebuild, -mesa-6.5.1-r4.ebuild:
+  Clean out old versions.
 
   09 Oct 2007; Donnie Berkholz <dberkholz@gentoo.org>; mesa-6.5-r3.ebuild,
   mesa-6.5.1-r1.ebuild, mesa-6.5.1-r4.ebuild, mesa-6.5.2.ebuild,
diff --git a/media-libs/mesa/files/6.4-dont-install-gles-headers.patch b/media-libs/mesa/files/6.4-dont-install-gles-headers.patch
deleted file mode 100644
index 5bdc0a11f656..000000000000
--- a/media-libs/mesa/files/6.4-dont-install-gles-headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN Mesa-6.4.orig/bin/installmesa Mesa-6.4/bin/installmesa
---- Mesa-6.4.orig/bin/installmesa	2005-09-13 06:36:17.000000000 -0700
-+++ Mesa-6.4/bin/installmesa	2005-10-13 14:10:39.000000000 -0700
-@@ -60,7 +60,6 @@
- 
- mkdir ${INCLUDE_DIR}
- mkdir ${INCLUDE_DIR}/GL
--mkdir ${INCLUDE_DIR}/GLES
- mkdir ${LIB_DIR}
- cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
- # NOT YET: cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
diff --git a/media-libs/mesa/files/6.4-multilib-fix.patch b/media-libs/mesa/files/6.4-multilib-fix.patch
deleted file mode 100644
index 8e16a9551e34..000000000000
--- a/media-libs/mesa/files/6.4-multilib-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- bin/installmesa.multilib-fix	2005-12-16 01:46:30.000000000 +0000
-+++ bin/installmesa	2005-12-16 01:47:22.000000000 +0000
-@@ -9,8 +9,9 @@
- 
- TOP=.
- 
--INCLUDE_DIR="/usr/local/include"
--LIB_DIR="/usr/local/lib"
-+# Default to /usr/local if these aren't already set.
-+INCLUDE_DIR="${INCLUDE_DIR:-/usr/local/include}"
-+LIB_DIR="${LIB_DIR:-/usr/local/lib}"
- 
- if [ "x$#" = "x0" ] ; then
- echo
-@@ -40,9 +41,9 @@
- 
- read INPUT
- 
--else
--INCLUDE_DIR=$1/include
--LIB_DIR=$1/lib
-+#else
-+#INCLUDE_DIR=$1/include
-+#LIB_DIR=$1/lib
- fi
- 
- # flags:
diff --git a/media-libs/mesa/files/6.5-re-order-context-destruction.patch b/media-libs/mesa/files/6.5-re-order-context-destruction.patch
deleted file mode 100644
index a882d07a6877..000000000000
--- a/media-libs/mesa/files/6.5-re-order-context-destruction.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/mesa/drivers/dri/r128/r128_context.c	2006/02/03 13:29:11	1.23
-+++ src/mesa/drivers/dri/r128/r128_context.c	2006/04/09 17:48:28	1.24
-@@ -296,10 +296,6 @@
-       _ac_DestroyContext( rmesa->glCtx );
-       _swrast_DestroyContext( rmesa->glCtx );
- 
--      /* free the Mesa context */
--      rmesa->glCtx->DriverCtx = NULL;
--      _mesa_destroy_context(rmesa->glCtx);
--
-       if ( release_texture_heaps ) {
-          /* This share group is about to go away, free our private
-           * texture object data.
-@@ -314,6 +310,10 @@
- 	 assert( is_empty_list( & rmesa->swapped ) );
-       }
- 
-+      /* free the Mesa context */
-+      rmesa->glCtx->DriverCtx = NULL;
-+      _mesa_destroy_context(rmesa->glCtx);
-+
-       /* free the option cache */
-       driDestroyOptionCache (&rmesa->optionCache);
- 
---- src/mesa/drivers/dri/r200/r200_context.c	2006/04/04 11:04:30	1.58
-+++ src/mesa/drivers/dri/r200/r200_context.c	2006/04/09 17:48:28	1.59
-@@ -590,10 +590,6 @@
- 	    r200VtxfmtDestroy( rmesa->glCtx );
-       }
- 
--      /* free the Mesa context */
--      rmesa->glCtx->DriverCtx = NULL;
--      _mesa_destroy_context( rmesa->glCtx );
--
-       if (rmesa->state.scissor.pClipRects) {
- 	 FREE(rmesa->state.scissor.pClipRects);
- 	 rmesa->state.scissor.pClipRects = NULL;
-@@ -613,6 +609,10 @@
- 	 assert( is_empty_list( & rmesa->swapped ) );
-       }
- 
-+      /* free the Mesa context */
-+      rmesa->glCtx->DriverCtx = NULL;
-+      _mesa_destroy_context( rmesa->glCtx );
-+
-       /* free the option cache */
-       driDestroyOptionCache (&rmesa->optionCache);
- 
---- src/mesa/drivers/dri/radeon/radeon_context.c	2006/04/04 11:04:30	1.51
-+++ src/mesa/drivers/dri/radeon/radeon_context.c	2006/04/09 17:48:28	1.52
-@@ -521,10 +521,6 @@
- 	    radeonVtxfmtDestroy( rmesa->glCtx );
-       }
- 
--      /* free the Mesa context */
--      rmesa->glCtx->DriverCtx = NULL;
--      _mesa_destroy_context( rmesa->glCtx );
--
-       _mesa_vector4f_free( &rmesa->tcl.ObjClean );
- 
-       if (rmesa->state.scissor.pClipRects) {
-@@ -546,6 +542,10 @@
- 	 assert( is_empty_list( & rmesa->swapped ) );
-       }
- 
-+      /* free the Mesa context */
-+      rmesa->glCtx->DriverCtx = NULL;
-+      _mesa_destroy_context( rmesa->glCtx );
-+
-       /* free the option cache */
-       driDestroyOptionCache (&rmesa->optionCache);
- 
diff --git a/media-libs/mesa/files/6.5.1-freebsd-dri.patch b/media-libs/mesa/files/6.5.1-freebsd-dri.patch
deleted file mode 100644
index aac4ab4232a9..000000000000
--- a/media-libs/mesa/files/6.5.1-freebsd-dri.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- Mesa-6.5.1/configs/freebsd-dri.orig	2006-08-17 11:09:02 -0300
-+++ Mesa-6.5.1/configs/freebsd-dri	2006-09-19 19:29:35 -0300
-@@ -16,20 +16,21 @@
- DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
- 
--CFLAGS = -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math \
--	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
-+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
-+        $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
- 
--CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
-+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES)
- 
- ASM_SOURCES = 
- 
- # Library/program dependencies
- LIBDRM_LIB = `pkg-config --libs libdrm`
-+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
- DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
- GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB)
- 
- GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
--GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
-+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11
- 
- 
- # Directories
diff --git a/media-libs/mesa/files/6.5.1-i965-bufmgr.patch b/media-libs/mesa/files/6.5.1-i965-bufmgr.patch
deleted file mode 100644
index f3a08291bc1b..000000000000
--- a/media-libs/mesa/files/6.5.1-i965-bufmgr.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mesa/drivers/dri/i965/bufmgr_fake.c.orig	2006-11-29 00:41:37.000000000 +0200
-+++ src/mesa/drivers/dri/i965/bufmgr_fake.c	2006-11-29 00:43:12.000000000 +0200
-@@ -1242,7 +1242,6 @@
-    LOCK(bm);
-    {
-       struct block *block, *tmp;
--      assert(intel->locked);
- 
-       foreach_s (block, tmp, &bm->referenced) {
- 
diff --git a/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch b/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch
deleted file mode 100644
index 885ab3eaf16c..000000000000
--- a/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- src/mesa/drivers/dri/mach64/mach64_ioctl.c	2006-04-01 05:37:38.000000000 +0300
-+++ src/mesa/drivers/dri/mach64-tst/mach64_ioctl.c	2006-07-18 19:43:10.000000000 +0300
-@@ -105,7 +105,7 @@ void mach64FlushVerticesLocked( mach64Co
-    int prim = mmesa->hw_primitive;
-    int fd = mmesa->driScreen->fd;
-    drm_mach64_vertex_t vertex;
--   int i, ret;
-+   int i;
- 
-    mmesa->num_verts = 0;
-    mmesa->vert_used = 0;
-@@ -123,6 +123,9 @@ void mach64FlushVerticesLocked( mach64Co
-       mmesa->dirty |= MACH64_UPLOAD_CLIPRECTS;
- 
-    if ( !count || !(mmesa->dirty & MACH64_UPLOAD_CLIPRECTS) ) {
-+      int to = 0;
-+      int ret;
-+
-       /* FIXME: Is this really necessary */
-       if ( nbox == 1 )
- 	 mmesa->sarea->nbox = 0;
-@@ -133,7 +136,10 @@ void mach64FlushVerticesLocked( mach64Co
-       vertex.buf = buffer;
-       vertex.used = count;
-       vertex.discard = 1;
--      ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drm_mach64_vertex_t) );
-+      do {
-+	 ret = drmCommandWrite( fd, DRM_MACH64_VERTEX,
-+				&vertex, sizeof(drm_mach64_vertex_t) );
-+      } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) );
-       if ( ret ) {
- 	 UNLOCK_HARDWARE( mmesa );
- 	 fprintf( stderr, "Error flushing vertex buffer: return = %d\n", ret );
-@@ -146,6 +152,8 @@ void mach64FlushVerticesLocked( mach64Co
- 	 int nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS, nbox );
- 	 drm_clip_rect_t *b = mmesa->sarea->boxes;
- 	 int discard = 0;
-+	 int to = 0;
-+	 int ret;
- 
- 	 mmesa->sarea->nbox = nr - i;
- 	 for ( ; i < nr ; i++ ) {
-@@ -164,7 +172,10 @@ void mach64FlushVerticesLocked( mach64Co
- 	 vertex.buf = buffer;
- 	 vertex.used = count;
- 	 vertex.discard = discard;
--	 ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drm_mach64_vertex_t) );
-+	 do {
-+	    ret = drmCommandWrite( fd, DRM_MACH64_VERTEX,
-+				   &vertex, sizeof(drm_mach64_vertex_t) );
-+	 } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) );
- 	 if ( ret ) {
- 	    UNLOCK_HARDWARE( mmesa );
- 	    fprintf( stderr, "Error flushing vertex buffer: return = %d\n", ret );
-@@ -180,14 +191,15 @@ void mach64FlushVerticesLocked( mach64Co
-  * Texture uploads
-  */
- 
--void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer,
-+void mach64FireBlitLocked( mach64ContextPtr mmesa, void *buffer,
- 			   GLint offset, GLint pitch, GLint format,
- 			   GLint x, GLint y, GLint width, GLint height )
- {
-    drm_mach64_blit_t blit;
--   GLint ret;
-+   int to = 0;
-+   int ret;
- 
--   blit.idx = buffer->idx;
-+   blit.buf = buffer;
-    blit.offset = offset;
-    blit.pitch = pitch;
-    blit.format = format;
-@@ -196,8 +208,10 @@ void mach64FireBlitLocked( mach64Context
-    blit.width = width;
-    blit.height = height;
- 
--   ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_BLIT, 
--                          &blit, sizeof(drm_mach64_blit_t) );
-+   do {
-+      ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_BLIT, 
-+			     &blit, sizeof(drm_mach64_blit_t) );
-+   } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) );
- 
-    if ( ret ) {
-       UNLOCK_HARDWARE( mmesa );
---- src/mesa/drivers/dri/mach64/mach64_ioctl.h	2005-02-01 01:40:05.000000000 +0200
-+++ src/mesa/drivers/dri/mach64-tst/mach64_ioctl.h	2006-04-11 18:52:56.000000000 +0300
-@@ -74,7 +74,7 @@ static __inline void *mach64AllocDmaLock
-    return head;
- }
- 
--extern void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer,
-+extern void mach64FireBlitLocked( mach64ContextPtr mmesa, void *buffer,
- 				  GLint offset, GLint pitch, GLint format,
- 				  GLint x, GLint y, GLint width, GLint height );
- 
---- src/mesa/drivers/dri/mach64/mach64_screen.c	2005-10-19 05:46:42.000000000 +0300
-+++ src/mesa/drivers/dri/mach64-tst/mach64_screen.c	2006-07-16 04:58:55.000000000 +0300
-@@ -520,7 +520,7 @@ void * __driCreateNewScreen_20050727( __
-    __DRIscreenPrivate *psp;
-    static const __DRIversion ddx_expected = { 6, 4, 0 };
-    static const __DRIversion dri_expected = { 4, 0, 0 };
--   static const __DRIversion drm_expected = { 1, 0, 0 };
-+   static const __DRIversion drm_expected = { 2, 0, 0 };
- 
-    dri_interface = interface;
- 
---- src/mesa/drivers/dri/mach64/mach64_texmem.c	2004-06-03 01:45:00.000000000 +0300
-+++ src/mesa/drivers/dri/mach64-tst/mach64_texmem.c	2006-04-11 18:54:09.000000000 +0300
-@@ -569,27 +569,17 @@ static void mach64UploadLocalSubImage( m
- 	 remaining > 0 ;
- 	 remaining -= rows, y += rows, i++ )
-    {
--       drmBufPtr buffer;
--       CARD32 *dst;
--
-        height = MIN2(remaining, rows);
- 
--       /* Grab the dma buffer for the texture blit */
--       buffer = mach64GetBufferLocked( mmesa );
--
--       dst = (CARD32 *)((char *)buffer->address + MACH64_HOSTDATA_BLIT_OFFSET);
--
-        assert(image->Data);
- 
-        {
-           const GLubyte *src = (const GLubyte *) image->Data +
-              (y * image->Width + x) * image->TexFormat->TexelBytes;
--          const GLuint bytes = width * height * image->TexFormat->TexelBytes;
--          memcpy(dst, src, bytes);
--       }
- 
--       mach64FireBlitLocked( mmesa, buffer, offset, pitch, format,
--			     x, y, width, height );
-+          mach64FireBlitLocked( mmesa, (void *)src, offset, pitch, format,
-+				x, y, width, height );
-+       }
- 
-    }
- 
diff --git a/media-libs/mesa/files/6.5.1-use-new-xcb-naming.patch b/media-libs/mesa/files/6.5.1-use-new-xcb-naming.patch
deleted file mode 100644
index 857501a1f609..000000000000
--- a/media-libs/mesa/files/6.5.1-use-new-xcb-naming.patch
+++ /dev/null
@@ -1,859 +0,0 @@
-Index: src/glx/x11/indirect.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect.c,v
-retrieving revision 1.32
-retrieving revision 1.33
-diff -u -b -B -r1.32 -r1.33
---- src/glx/x11/indirect.c	31 Aug 2006 20:41:16 -0000	1.32
-+++ src/glx/x11/indirect.c	26 Sep 2006 23:56:20 -0000	1.33
-@@ -33,8 +33,8 @@
- #include <GL/glxproto.h>
- #ifdef USE_XCB
--#include <X11/xcl.h>
--#include <X11/XCB/xcb.h>
--#include <X11/XCB/glx.h>
-+#include <X11/Xlib-xcb.h>
-+#include <xcb/xcb.h>
-+#include <xcb/glx.h>
- #endif /* USE_XCB */
- 
- #define __GLX_PAD(n) (((n) + 3) & ~3)
-@@ -280,9 +280,9 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxNewList(c, gc->currentContextTag, list, mode);
-+        xcb_glx_new_list(c, gc->currentContextTag, list, mode);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_NewList, cmdlen);
-         (void) memcpy((void *)(pc + 0), (void *)(&list), 4);
-@@ -302,9 +302,9 @@
-     const GLuint cmdlen = 0;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxEndList(c, gc->currentContextTag);
-+        xcb_glx_end_list(c, gc->currentContextTag);
- #else
-         (void) __glXSetupSingleRequest(gc, X_GLsop_EndList, cmdlen);
-         UnlockDisplay(dpy); SyncHandle();
-@@ -366,9 +366,9 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxDeleteLists(c, gc->currentContextTag, list, range);
-+        xcb_glx_delete_lists(c, gc->currentContextTag, list, range);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_DeleteLists, cmdlen);
-         (void) memcpy((void *)(pc + 0), (void *)(&list), 4);
-@@ -389,9 +389,9 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGenListsRep *reply = XCBGlxGenListsReply(c, XCBGlxGenLists(c, gc->currentContextTag, range), NULL);
-+        xcb_glx_gen_lists_reply_t *reply = xcb_glx_gen_lists_reply(c, xcb_glx_gen_lists(c, gc->currentContextTag, range), NULL);
-         retval = reply->ret_val;
-         free(reply);
- #else
-@@ -3312,10 +3312,10 @@
-     const GLuint cmdlen = 28;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxReadPixelsRep *reply = XCBGlxReadPixelsReply(c, XCBGlxReadPixels(c, gc->currentContextTag, x, y, width, height, format, type, state->storePack.swapEndian, 0), NULL);
--        (void)memcpy(pixels, XCBGlxReadPixelsData(reply), XCBGlxReadPixelsDataLength(reply) * sizeof(GLvoid));
-+        xcb_glx_read_pixels_reply_t *reply = xcb_glx_read_pixels_reply(c, xcb_glx_read_pixels(c, gc->currentContextTag, x, y, width, height, format, type, state->storePack.swapEndian, 0), NULL);
-+        (void)memcpy(pixels, xcb_glx_read_pixels_data(reply), xcb_glx_read_pixels_data_length(reply) * sizeof(GLvoid));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_ReadPixels, cmdlen);
-@@ -3384,10 +3384,10 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetClipPlaneRep *reply = XCBGlxGetClipPlaneReply(c, XCBGlxGetClipPlane(c, gc->currentContextTag, plane), NULL);
--        (void)memcpy(equation, XCBGlxGetClipPlaneData(reply), XCBGlxGetClipPlaneDataLength(reply) * sizeof(GLdouble));
-+        xcb_glx_get_clip_plane_reply_t *reply = xcb_glx_get_clip_plane_reply(c, xcb_glx_get_clip_plane(c, gc->currentContextTag, plane), NULL);
-+        (void)memcpy(equation, xcb_glx_get_clip_plane_data(reply), xcb_glx_get_clip_plane_data_length(reply) * sizeof(GLdouble));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetClipPlane, cmdlen);
-@@ -3408,13 +3408,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetLightfvRep *reply = XCBGlxGetLightfvReply(c, XCBGlxGetLightfv(c, gc->currentContextTag, light, pname), NULL);
--        if (XCBGlxGetLightfvDataLength(reply) == 0)
-+        xcb_glx_get_lightfv_reply_t *reply = xcb_glx_get_lightfv_reply(c, xcb_glx_get_lightfv(c, gc->currentContextTag, light, pname), NULL);
-+        if (xcb_glx_get_lightfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetLightfvData(reply), XCBGlxGetLightfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_lightfv_data(reply), xcb_glx_get_lightfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetLightfv, cmdlen);
-@@ -3436,13 +3436,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetLightivRep *reply = XCBGlxGetLightivReply(c, XCBGlxGetLightiv(c, gc->currentContextTag, light, pname), NULL);
--        if (XCBGlxGetLightivDataLength(reply) == 0)
-+        xcb_glx_get_lightiv_reply_t *reply = xcb_glx_get_lightiv_reply(c, xcb_glx_get_lightiv(c, gc->currentContextTag, light, pname), NULL);
-+        if (xcb_glx_get_lightiv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetLightivData(reply), XCBGlxGetLightivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_lightiv_data(reply), xcb_glx_get_lightiv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetLightiv, cmdlen);
-@@ -3464,13 +3464,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetMapdvRep *reply = XCBGlxGetMapdvReply(c, XCBGlxGetMapdv(c, gc->currentContextTag, target, query), NULL);
--        if (XCBGlxGetMapdvDataLength(reply) == 0)
-+        xcb_glx_get_mapdv_reply_t *reply = xcb_glx_get_mapdv_reply(c, xcb_glx_get_mapdv(c, gc->currentContextTag, target, query), NULL);
-+        if (xcb_glx_get_mapdv_data_length(reply) == 0)
-             (void)memcpy(v, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(v, XCBGlxGetMapdvData(reply), XCBGlxGetMapdvDataLength(reply) * sizeof(GLdouble));
-+        (void)memcpy(v, xcb_glx_get_mapdv_data(reply), xcb_glx_get_mapdv_data_length(reply) * sizeof(GLdouble));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMapdv, cmdlen);
-@@ -3492,13 +3492,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetMapfvRep *reply = XCBGlxGetMapfvReply(c, XCBGlxGetMapfv(c, gc->currentContextTag, target, query), NULL);
--        if (XCBGlxGetMapfvDataLength(reply) == 0)
-+        xcb_glx_get_mapfv_reply_t *reply = xcb_glx_get_mapfv_reply(c, xcb_glx_get_mapfv(c, gc->currentContextTag, target, query), NULL);
-+        if (xcb_glx_get_mapfv_data_length(reply) == 0)
-             (void)memcpy(v, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(v, XCBGlxGetMapfvData(reply), XCBGlxGetMapfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(v, xcb_glx_get_mapfv_data(reply), xcb_glx_get_mapfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMapfv, cmdlen);
-@@ -3520,13 +3520,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetMapivRep *reply = XCBGlxGetMapivReply(c, XCBGlxGetMapiv(c, gc->currentContextTag, target, query), NULL);
--        if (XCBGlxGetMapivDataLength(reply) == 0)
-+        xcb_glx_get_mapiv_reply_t *reply = xcb_glx_get_mapiv_reply(c, xcb_glx_get_mapiv(c, gc->currentContextTag, target, query), NULL);
-+        if (xcb_glx_get_mapiv_data_length(reply) == 0)
-             (void)memcpy(v, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(v, XCBGlxGetMapivData(reply), XCBGlxGetMapivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(v, xcb_glx_get_mapiv_data(reply), xcb_glx_get_mapiv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMapiv, cmdlen);
-@@ -3548,13 +3548,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetMaterialfvRep *reply = XCBGlxGetMaterialfvReply(c, XCBGlxGetMaterialfv(c, gc->currentContextTag, face, pname), NULL);
--        if (XCBGlxGetMaterialfvDataLength(reply) == 0)
-+        xcb_glx_get_materialfv_reply_t *reply = xcb_glx_get_materialfv_reply(c, xcb_glx_get_materialfv(c, gc->currentContextTag, face, pname), NULL);
-+        if (xcb_glx_get_materialfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetMaterialfvData(reply), XCBGlxGetMaterialfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_materialfv_data(reply), xcb_glx_get_materialfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMaterialfv, cmdlen);
-@@ -3576,13 +3576,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetMaterialivRep *reply = XCBGlxGetMaterialivReply(c, XCBGlxGetMaterialiv(c, gc->currentContextTag, face, pname), NULL);
--        if (XCBGlxGetMaterialivDataLength(reply) == 0)
-+        xcb_glx_get_materialiv_reply_t *reply = xcb_glx_get_materialiv_reply(c, xcb_glx_get_materialiv(c, gc->currentContextTag, face, pname), NULL);
-+        if (xcb_glx_get_materialiv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetMaterialivData(reply), XCBGlxGetMaterialivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_materialiv_data(reply), xcb_glx_get_materialiv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMaterialiv, cmdlen);
-@@ -3604,13 +3604,13 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetPixelMapfvRep *reply = XCBGlxGetPixelMapfvReply(c, XCBGlxGetPixelMapfv(c, gc->currentContextTag, map), NULL);
--        if (XCBGlxGetPixelMapfvDataLength(reply) == 0)
-+        xcb_glx_get_pixel_mapfv_reply_t *reply = xcb_glx_get_pixel_mapfv_reply(c, xcb_glx_get_pixel_mapfv(c, gc->currentContextTag, map), NULL);
-+        if (xcb_glx_get_pixel_mapfv_data_length(reply) == 0)
-             (void)memcpy(values, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(values, XCBGlxGetPixelMapfvData(reply), XCBGlxGetPixelMapfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(values, xcb_glx_get_pixel_mapfv_data(reply), xcb_glx_get_pixel_mapfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetPixelMapfv, cmdlen);
-@@ -3631,13 +3631,13 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetPixelMapuivRep *reply = XCBGlxGetPixelMapuivReply(c, XCBGlxGetPixelMapuiv(c, gc->currentContextTag, map), NULL);
--        if (XCBGlxGetPixelMapuivDataLength(reply) == 0)
-+        xcb_glx_get_pixel_mapuiv_reply_t *reply = xcb_glx_get_pixel_mapuiv_reply(c, xcb_glx_get_pixel_mapuiv(c, gc->currentContextTag, map), NULL);
-+        if (xcb_glx_get_pixel_mapuiv_data_length(reply) == 0)
-             (void)memcpy(values, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(values, XCBGlxGetPixelMapuivData(reply), XCBGlxGetPixelMapuivDataLength(reply) * sizeof(GLuint));
-+        (void)memcpy(values, xcb_glx_get_pixel_mapuiv_data(reply), xcb_glx_get_pixel_mapuiv_data_length(reply) * sizeof(GLuint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetPixelMapuiv, cmdlen);
-@@ -3658,13 +3658,13 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetPixelMapusvRep *reply = XCBGlxGetPixelMapusvReply(c, XCBGlxGetPixelMapusv(c, gc->currentContextTag, map), NULL);
--        if (XCBGlxGetPixelMapusvDataLength(reply) == 0)
-+        xcb_glx_get_pixel_mapusv_reply_t *reply = xcb_glx_get_pixel_mapusv_reply(c, xcb_glx_get_pixel_mapusv(c, gc->currentContextTag, map), NULL);
-+        if (xcb_glx_get_pixel_mapusv_data_length(reply) == 0)
-             (void)memcpy(values, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(values, XCBGlxGetPixelMapusvData(reply), XCBGlxGetPixelMapusvDataLength(reply) * sizeof(GLushort));
-+        (void)memcpy(values, xcb_glx_get_pixel_mapusv_data(reply), xcb_glx_get_pixel_mapusv_data_length(reply) * sizeof(GLushort));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetPixelMapusv, cmdlen);
-@@ -3686,10 +3686,10 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetPolygonStippleRep *reply = XCBGlxGetPolygonStippleReply(c, XCBGlxGetPolygonStipple(c, gc->currentContextTag, 0), NULL);
--        (void)memcpy(mask, XCBGlxGetPolygonStippleData(reply), XCBGlxGetPolygonStippleDataLength(reply) * sizeof(GLubyte));
-+        xcb_glx_get_polygon_stipple_reply_t *reply = xcb_glx_get_polygon_stipple_reply(c, xcb_glx_get_polygon_stipple(c, gc->currentContextTag, 0), NULL);
-+        (void)memcpy(mask, xcb_glx_get_polygon_stipple_data(reply), xcb_glx_get_polygon_stipple_data_length(reply) * sizeof(GLubyte));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetPolygonStipple, cmdlen);
-@@ -3710,13 +3710,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexEnvfvRep *reply = XCBGlxGetTexEnvfvReply(c, XCBGlxGetTexEnvfv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetTexEnvfvDataLength(reply) == 0)
-+        xcb_glx_get_tex_envfv_reply_t *reply = xcb_glx_get_tex_envfv_reply(c, xcb_glx_get_tex_envfv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_tex_envfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexEnvfvData(reply), XCBGlxGetTexEnvfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_tex_envfv_data(reply), xcb_glx_get_tex_envfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexEnvfv, cmdlen);
-@@ -3738,13 +3738,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexEnvivRep *reply = XCBGlxGetTexEnvivReply(c, XCBGlxGetTexEnviv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetTexEnvivDataLength(reply) == 0)
-+        xcb_glx_get_tex_enviv_reply_t *reply = xcb_glx_get_tex_enviv_reply(c, xcb_glx_get_tex_enviv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_tex_enviv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexEnvivData(reply), XCBGlxGetTexEnvivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_tex_enviv_data(reply), xcb_glx_get_tex_enviv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexEnviv, cmdlen);
-@@ -3766,13 +3766,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexGendvRep *reply = XCBGlxGetTexGendvReply(c, XCBGlxGetTexGendv(c, gc->currentContextTag, coord, pname), NULL);
--        if (XCBGlxGetTexGendvDataLength(reply) == 0)
-+        xcb_glx_get_tex_gendv_reply_t *reply = xcb_glx_get_tex_gendv_reply(c, xcb_glx_get_tex_gendv(c, gc->currentContextTag, coord, pname), NULL);
-+        if (xcb_glx_get_tex_gendv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexGendvData(reply), XCBGlxGetTexGendvDataLength(reply) * sizeof(GLdouble));
-+        (void)memcpy(params, xcb_glx_get_tex_gendv_data(reply), xcb_glx_get_tex_gendv_data_length(reply) * sizeof(GLdouble));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexGendv, cmdlen);
-@@ -3794,13 +3794,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexGenfvRep *reply = XCBGlxGetTexGenfvReply(c, XCBGlxGetTexGenfv(c, gc->currentContextTag, coord, pname), NULL);
--        if (XCBGlxGetTexGenfvDataLength(reply) == 0)
-+        xcb_glx_get_tex_genfv_reply_t *reply = xcb_glx_get_tex_genfv_reply(c, xcb_glx_get_tex_genfv(c, gc->currentContextTag, coord, pname), NULL);
-+        if (xcb_glx_get_tex_genfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexGenfvData(reply), XCBGlxGetTexGenfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_tex_genfv_data(reply), xcb_glx_get_tex_genfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexGenfv, cmdlen);
-@@ -3822,13 +3822,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexGenivRep *reply = XCBGlxGetTexGenivReply(c, XCBGlxGetTexGeniv(c, gc->currentContextTag, coord, pname), NULL);
--        if (XCBGlxGetTexGenivDataLength(reply) == 0)
-+        xcb_glx_get_tex_geniv_reply_t *reply = xcb_glx_get_tex_geniv_reply(c, xcb_glx_get_tex_geniv(c, gc->currentContextTag, coord, pname), NULL);
-+        if (xcb_glx_get_tex_geniv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexGenivData(reply), XCBGlxGetTexGenivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_tex_geniv_data(reply), xcb_glx_get_tex_geniv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexGeniv, cmdlen);
-@@ -3851,10 +3851,10 @@
-     const GLuint cmdlen = 20;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexImageRep *reply = XCBGlxGetTexImageReply(c, XCBGlxGetTexImage(c, gc->currentContextTag, target, level, format, type, state->storePack.swapEndian), NULL);
--        (void)memcpy(pixels, XCBGlxGetTexImageData(reply), XCBGlxGetTexImageDataLength(reply) * sizeof(GLvoid));
-+        xcb_glx_get_tex_image_reply_t *reply = xcb_glx_get_tex_image_reply(c, xcb_glx_get_tex_image(c, gc->currentContextTag, target, level, format, type, state->storePack.swapEndian), NULL);
-+        (void)memcpy(pixels, xcb_glx_get_tex_image_data(reply), xcb_glx_get_tex_image_data_length(reply) * sizeof(GLvoid));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexImage, cmdlen);
-@@ -3880,13 +3880,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexParameterfvRep *reply = XCBGlxGetTexParameterfvReply(c, XCBGlxGetTexParameterfv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetTexParameterfvDataLength(reply) == 0)
-+        xcb_glx_get_tex_parameterfv_reply_t *reply = xcb_glx_get_tex_parameterfv_reply(c, xcb_glx_get_tex_parameterfv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_tex_parameterfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexParameterfvData(reply), XCBGlxGetTexParameterfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_tex_parameterfv_data(reply), xcb_glx_get_tex_parameterfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexParameterfv, cmdlen);
-@@ -3908,13 +3908,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexParameterivRep *reply = XCBGlxGetTexParameterivReply(c, XCBGlxGetTexParameteriv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetTexParameterivDataLength(reply) == 0)
-+        xcb_glx_get_tex_parameteriv_reply_t *reply = xcb_glx_get_tex_parameteriv_reply(c, xcb_glx_get_tex_parameteriv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_tex_parameteriv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexParameterivData(reply), XCBGlxGetTexParameterivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_tex_parameteriv_data(reply), xcb_glx_get_tex_parameteriv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexParameteriv, cmdlen);
-@@ -3936,13 +3936,13 @@
-     const GLuint cmdlen = 12;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexLevelParameterfvRep *reply = XCBGlxGetTexLevelParameterfvReply(c, XCBGlxGetTexLevelParameterfv(c, gc->currentContextTag, target, level, pname), NULL);
--        if (XCBGlxGetTexLevelParameterfvDataLength(reply) == 0)
-+        xcb_glx_get_tex_level_parameterfv_reply_t *reply = xcb_glx_get_tex_level_parameterfv_reply(c, xcb_glx_get_tex_level_parameterfv(c, gc->currentContextTag, target, level, pname), NULL);
-+        if (xcb_glx_get_tex_level_parameterfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexLevelParameterfvData(reply), XCBGlxGetTexLevelParameterfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_tex_level_parameterfv_data(reply), xcb_glx_get_tex_level_parameterfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexLevelParameterfv, cmdlen);
-@@ -3965,13 +3965,13 @@
-     const GLuint cmdlen = 12;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetTexLevelParameterivRep *reply = XCBGlxGetTexLevelParameterivReply(c, XCBGlxGetTexLevelParameteriv(c, gc->currentContextTag, target, level, pname), NULL);
--        if (XCBGlxGetTexLevelParameterivDataLength(reply) == 0)
-+        xcb_glx_get_tex_level_parameteriv_reply_t *reply = xcb_glx_get_tex_level_parameteriv_reply(c, xcb_glx_get_tex_level_parameteriv(c, gc->currentContextTag, target, level, pname), NULL);
-+        if (xcb_glx_get_tex_level_parameteriv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetTexLevelParameterivData(reply), XCBGlxGetTexLevelParameterivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_tex_level_parameteriv_data(reply), xcb_glx_get_tex_level_parameteriv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetTexLevelParameteriv, cmdlen);
-@@ -3995,9 +3995,9 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxIsListRep *reply = XCBGlxIsListReply(c, XCBGlxIsList(c, gc->currentContextTag, list), NULL);
-+        xcb_glx_is_list_reply_t *reply = xcb_glx_is_list_reply(c, xcb_glx_is_list(c, gc->currentContextTag, list), NULL);
-         retval = reply->ret_val;
-         free(reply);
- #else
-@@ -4311,10 +4311,10 @@
-     const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
-     if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxAreTexturesResidentRep *reply = XCBGlxAreTexturesResidentReply(c, XCBGlxAreTexturesResident(c, gc->currentContextTag, n, textures), NULL);
--        (void)memcpy(residences, XCBGlxAreTexturesResidentData(reply), XCBGlxAreTexturesResidentDataLength(reply) * sizeof(GLboolean));
-+        xcb_glx_are_textures_resident_reply_t *reply = xcb_glx_are_textures_resident_reply(c, xcb_glx_are_textures_resident(c, gc->currentContextTag, n, textures), NULL);
-+        (void)memcpy(residences, xcb_glx_are_textures_resident_data(reply), xcb_glx_are_textures_resident_data_length(reply) * sizeof(GLboolean));
-         retval = reply->ret_val;
-         free(reply);
- #else
-@@ -4426,10 +4426,10 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGenTexturesRep *reply = XCBGlxGenTexturesReply(c, XCBGlxGenTextures(c, gc->currentContextTag, n), NULL);
--        (void)memcpy(textures, XCBGlxGenTexturesData(reply), XCBGlxGenTexturesDataLength(reply) * sizeof(GLuint));
-+        xcb_glx_gen_textures_reply_t *reply = xcb_glx_gen_textures_reply(c, xcb_glx_gen_textures(c, gc->currentContextTag, n), NULL);
-+        (void)memcpy(textures, xcb_glx_gen_textures_data(reply), xcb_glx_gen_textures_data_length(reply) * sizeof(GLuint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GenTextures, cmdlen);
-@@ -4451,9 +4451,9 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxIsTextureRep *reply = XCBGlxIsTextureReply(c, XCBGlxIsTexture(c, gc->currentContextTag, texture), NULL);
-+        xcb_glx_is_texture_reply_t *reply = xcb_glx_is_texture_reply(c, xcb_glx_is_texture(c, gc->currentContextTag, texture), NULL);
-         retval = reply->ret_val;
-         free(reply);
- #else
-@@ -4672,10 +4672,10 @@
-     const GLuint cmdlen = 16;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetColorTableRep *reply = XCBGlxGetColorTableReply(c, XCBGlxGetColorTable(c, gc->currentContextTag, target, format, type, state->storePack.swapEndian), NULL);
--        (void)memcpy(table, XCBGlxGetColorTableData(reply), XCBGlxGetColorTableDataLength(reply) * sizeof(GLvoid));
-+        xcb_glx_get_color_table_reply_t *reply = xcb_glx_get_color_table_reply(c, xcb_glx_get_color_table(c, gc->currentContextTag, target, format, type, state->storePack.swapEndian), NULL);
-+        (void)memcpy(table, xcb_glx_get_color_table_data(reply), xcb_glx_get_color_table_data_length(reply) * sizeof(GLvoid));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetColorTable, cmdlen);
-@@ -4700,13 +4700,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetColorTableParameterfvRep *reply = XCBGlxGetColorTableParameterfvReply(c, XCBGlxGetColorTableParameterfv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetColorTableParameterfvDataLength(reply) == 0)
-+        xcb_glx_get_color_table_parameterfv_reply_t *reply = xcb_glx_get_color_table_parameterfv_reply(c, xcb_glx_get_color_table_parameterfv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_color_table_parameterfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetColorTableParameterfvData(reply), XCBGlxGetColorTableParameterfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_color_table_parameterfv_data(reply), xcb_glx_get_color_table_parameterfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetColorTableParameterfv, cmdlen);
-@@ -4728,13 +4728,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetColorTableParameterivRep *reply = XCBGlxGetColorTableParameterivReply(c, XCBGlxGetColorTableParameteriv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetColorTableParameterivDataLength(reply) == 0)
-+        xcb_glx_get_color_table_parameteriv_reply_t *reply = xcb_glx_get_color_table_parameteriv_reply(c, xcb_glx_get_color_table_parameteriv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_color_table_parameteriv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetColorTableParameterivData(reply), XCBGlxGetColorTableParameterivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_color_table_parameteriv_data(reply), xcb_glx_get_color_table_parameteriv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetColorTableParameteriv, cmdlen);
-@@ -4965,10 +4965,10 @@
-     const GLuint cmdlen = 16;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetConvolutionFilterRep *reply = XCBGlxGetConvolutionFilterReply(c, XCBGlxGetConvolutionFilter(c, gc->currentContextTag, target, format, type, state->storePack.swapEndian), NULL);
--        (void)memcpy(image, XCBGlxGetConvolutionFilterData(reply), XCBGlxGetConvolutionFilterDataLength(reply) * sizeof(GLvoid));
-+        xcb_glx_get_convolution_filter_reply_t *reply = xcb_glx_get_convolution_filter_reply(c, xcb_glx_get_convolution_filter(c, gc->currentContextTag, target, format, type, state->storePack.swapEndian), NULL);
-+        (void)memcpy(image, xcb_glx_get_convolution_filter_data(reply), xcb_glx_get_convolution_filter_data_length(reply) * sizeof(GLvoid));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetConvolutionFilter, cmdlen);
-@@ -4993,13 +4993,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetConvolutionParameterfvRep *reply = XCBGlxGetConvolutionParameterfvReply(c, XCBGlxGetConvolutionParameterfv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetConvolutionParameterfvDataLength(reply) == 0)
-+        xcb_glx_get_convolution_parameterfv_reply_t *reply = xcb_glx_get_convolution_parameterfv_reply(c, xcb_glx_get_convolution_parameterfv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_convolution_parameterfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetConvolutionParameterfvData(reply), XCBGlxGetConvolutionParameterfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_convolution_parameterfv_data(reply), xcb_glx_get_convolution_parameterfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetConvolutionParameterfv, cmdlen);
-@@ -5021,13 +5021,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetConvolutionParameterivRep *reply = XCBGlxGetConvolutionParameterivReply(c, XCBGlxGetConvolutionParameteriv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetConvolutionParameterivDataLength(reply) == 0)
-+        xcb_glx_get_convolution_parameteriv_reply_t *reply = xcb_glx_get_convolution_parameteriv_reply(c, xcb_glx_get_convolution_parameteriv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_convolution_parameteriv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetConvolutionParameterivData(reply), XCBGlxGetConvolutionParameterivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_convolution_parameteriv_data(reply), xcb_glx_get_convolution_parameteriv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetConvolutionParameteriv, cmdlen);
-@@ -5050,10 +5050,10 @@
-     const GLuint cmdlen = 16;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetHistogramRep *reply = XCBGlxGetHistogramReply(c, XCBGlxGetHistogram(c, gc->currentContextTag, target, reset, format, type, state->storePack.swapEndian), NULL);
--        (void)memcpy(values, XCBGlxGetHistogramData(reply), XCBGlxGetHistogramDataLength(reply) * sizeof(GLvoid));
-+        xcb_glx_get_histogram_reply_t *reply = xcb_glx_get_histogram_reply(c, xcb_glx_get_histogram(c, gc->currentContextTag, target, reset, format, type, state->storePack.swapEndian), NULL);
-+        (void)memcpy(values, xcb_glx_get_histogram_data(reply), xcb_glx_get_histogram_data_length(reply) * sizeof(GLvoid));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetHistogram, cmdlen);
-@@ -5079,13 +5079,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetHistogramParameterfvRep *reply = XCBGlxGetHistogramParameterfvReply(c, XCBGlxGetHistogramParameterfv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetHistogramParameterfvDataLength(reply) == 0)
-+        xcb_glx_get_histogram_parameterfv_reply_t *reply = xcb_glx_get_histogram_parameterfv_reply(c, xcb_glx_get_histogram_parameterfv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_histogram_parameterfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetHistogramParameterfvData(reply), XCBGlxGetHistogramParameterfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_histogram_parameterfv_data(reply), xcb_glx_get_histogram_parameterfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetHistogramParameterfv, cmdlen);
-@@ -5107,13 +5107,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetHistogramParameterivRep *reply = XCBGlxGetHistogramParameterivReply(c, XCBGlxGetHistogramParameteriv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetHistogramParameterivDataLength(reply) == 0)
-+        xcb_glx_get_histogram_parameteriv_reply_t *reply = xcb_glx_get_histogram_parameteriv_reply(c, xcb_glx_get_histogram_parameteriv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_histogram_parameteriv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetHistogramParameterivData(reply), XCBGlxGetHistogramParameterivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_histogram_parameteriv_data(reply), xcb_glx_get_histogram_parameteriv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetHistogramParameteriv, cmdlen);
-@@ -5136,10 +5136,10 @@
-     const GLuint cmdlen = 16;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetMinmaxRep *reply = XCBGlxGetMinmaxReply(c, XCBGlxGetMinmax(c, gc->currentContextTag, target, reset, format, type, state->storePack.swapEndian), NULL);
--        (void)memcpy(values, XCBGlxGetMinmaxData(reply), XCBGlxGetMinmaxDataLength(reply) * sizeof(GLvoid));
-+        xcb_glx_get_minmax_reply_t *reply = xcb_glx_get_minmax_reply(c, xcb_glx_get_minmax(c, gc->currentContextTag, target, reset, format, type, state->storePack.swapEndian), NULL);
-+        (void)memcpy(values, xcb_glx_get_minmax_data(reply), xcb_glx_get_minmax_data_length(reply) * sizeof(GLvoid));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMinmax, cmdlen);
-@@ -5165,13 +5165,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetMinmaxParameterfvRep *reply = XCBGlxGetMinmaxParameterfvReply(c, XCBGlxGetMinmaxParameterfv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetMinmaxParameterfvDataLength(reply) == 0)
-+        xcb_glx_get_minmax_parameterfv_reply_t *reply = xcb_glx_get_minmax_parameterfv_reply(c, xcb_glx_get_minmax_parameterfv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_minmax_parameterfv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetMinmaxParameterfvData(reply), XCBGlxGetMinmaxParameterfvDataLength(reply) * sizeof(GLfloat));
-+        (void)memcpy(params, xcb_glx_get_minmax_parameterfv_data(reply), xcb_glx_get_minmax_parameterfv_data_length(reply) * sizeof(GLfloat));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMinmaxParameterfv, cmdlen);
-@@ -5193,13 +5193,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetMinmaxParameterivRep *reply = XCBGlxGetMinmaxParameterivReply(c, XCBGlxGetMinmaxParameteriv(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetMinmaxParameterivDataLength(reply) == 0)
-+        xcb_glx_get_minmax_parameteriv_reply_t *reply = xcb_glx_get_minmax_parameteriv_reply(c, xcb_glx_get_minmax_parameteriv(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_minmax_parameteriv_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetMinmaxParameterivData(reply), XCBGlxGetMinmaxParameterivDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_minmax_parameteriv_data(reply), xcb_glx_get_minmax_parameteriv_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetMinmaxParameteriv, cmdlen);
-@@ -6578,9 +6578,9 @@
-     const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
-     if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxDeleteQueriesARB(c, gc->currentContextTag, n, ids);
-+        xcb_glx_delete_queries_arb(c, gc->currentContextTag, n, ids);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_DeleteQueriesARB, cmdlen);
-         (void) memcpy((void *)(pc + 0), (void *)(&n), 4);
-@@ -6612,10 +6612,10 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGenQueriesARBRep *reply = XCBGlxGenQueriesARBReply(c, XCBGlxGenQueriesARB(c, gc->currentContextTag, n), NULL);
--        (void)memcpy(ids, XCBGlxGenQueriesARBData(reply), XCBGlxGenQueriesARBDataLength(reply) * sizeof(GLuint));
-+        xcb_glx_gen_queries_arb_reply_t *reply = xcb_glx_gen_queries_arb_reply(c, xcb_glx_gen_queries_arb(c, gc->currentContextTag, n), NULL);
-+        (void)memcpy(ids, xcb_glx_gen_queries_arb_data(reply), xcb_glx_gen_queries_arb_data_length(reply) * sizeof(GLuint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GenQueriesARB, cmdlen);
-@@ -6636,13 +6636,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetQueryObjectivARBRep *reply = XCBGlxGetQueryObjectivARBReply(c, XCBGlxGetQueryObjectivARB(c, gc->currentContextTag, id, pname), NULL);
--        if (XCBGlxGetQueryObjectivARBDataLength(reply) == 0)
-+        xcb_glx_get_query_objectiv_arb_reply_t *reply = xcb_glx_get_query_objectiv_arb_reply(c, xcb_glx_get_query_objectiv_arb(c, gc->currentContextTag, id, pname), NULL);
-+        if (xcb_glx_get_query_objectiv_arb_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetQueryObjectivARBData(reply), XCBGlxGetQueryObjectivARBDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_query_objectiv_arb_data(reply), xcb_glx_get_query_objectiv_arb_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetQueryObjectivARB, cmdlen);
-@@ -6664,13 +6664,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetQueryObjectuivARBRep *reply = XCBGlxGetQueryObjectuivARBReply(c, XCBGlxGetQueryObjectuivARB(c, gc->currentContextTag, id, pname), NULL);
--        if (XCBGlxGetQueryObjectuivARBDataLength(reply) == 0)
-+        xcb_glx_get_query_objectuiv_arb_reply_t *reply = xcb_glx_get_query_objectuiv_arb_reply(c, xcb_glx_get_query_objectuiv_arb(c, gc->currentContextTag, id, pname), NULL);
-+        if (xcb_glx_get_query_objectuiv_arb_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetQueryObjectuivARBData(reply), XCBGlxGetQueryObjectuivARBDataLength(reply) * sizeof(GLuint));
-+        (void)memcpy(params, xcb_glx_get_query_objectuiv_arb_data(reply), xcb_glx_get_query_objectuiv_arb_data_length(reply) * sizeof(GLuint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetQueryObjectuivARB, cmdlen);
-@@ -6692,13 +6692,13 @@
-     const GLuint cmdlen = 8;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxGetQueryivARBRep *reply = XCBGlxGetQueryivARBReply(c, XCBGlxGetQueryivARB(c, gc->currentContextTag, target, pname), NULL);
--        if (XCBGlxGetQueryivARBDataLength(reply) == 0)
-+        xcb_glx_get_queryiv_arb_reply_t *reply = xcb_glx_get_queryiv_arb_reply(c, xcb_glx_get_queryiv_arb(c, gc->currentContextTag, target, pname), NULL);
-+        if (xcb_glx_get_queryiv_arb_data_length(reply) == 0)
-             (void)memcpy(params, &reply->datum, sizeof(reply->datum));
-         else
--        (void)memcpy(params, XCBGlxGetQueryivARBData(reply), XCBGlxGetQueryivARBDataLength(reply) * sizeof(GLint));
-+        (void)memcpy(params, xcb_glx_get_queryiv_arb_data(reply), xcb_glx_get_queryiv_arb_data_length(reply) * sizeof(GLint));
-         free(reply);
- #else
-         GLubyte const * pc = __glXSetupSingleRequest(gc, X_GLsop_GetQueryivARB, cmdlen);
-@@ -6721,9 +6721,9 @@
-     const GLuint cmdlen = 4;
-     if (__builtin_expect(dpy != NULL, 1)) {
- #ifdef USE_XCB
--        XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+        xcb_connection_t *c = XGetXCBConnection(dpy);
-         (void) __glXFlushRenderBuffer(gc, gc->pc);
--        XCBGlxIsQueryARBRep *reply = XCBGlxIsQueryARBReply(c, XCBGlxIsQueryARB(c, gc->currentContextTag, id), NULL);
-+        xcb_glx_is_query_arb_reply_t *reply = xcb_glx_is_query_arb_reply(c, xcb_glx_is_query_arb(c, gc->currentContextTag, id), NULL);
-         retval = reply->ret_val;
-         free(reply);
- #else
-Index: src/glx/x11/glxext.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v
-retrieving revision 1.24
-retrieving revision 1.25
-diff -u -b -B -r1.24 -r1.25
---- src/glx/x11/glxext.c	29 Aug 2006 15:38:19 -0000	1.24
-+++ src/glx/x11/glxext.c	26 Sep 2006 23:56:20 -0000	1.25
-@@ -65,8 +65,8 @@
- 
- #ifdef USE_XCB
--#include <X11/xcl.h>
--#include <X11/XCB/xcb.h>
--#include <X11/XCB/glx.h>
-+#include <X11/Xlib-xcb.h>
-+#include <xcb/xcb.h>
-+#include <xcb/glx.h>
- #endif
- 
- #include <assert.h>
-@@ -1284,7 +1284,7 @@
- {
-     Display * const dpy = ctx->currentDpy;
- #ifdef USE_XCB
--    XCBConnection *c = XCBConnectionOfDisplay(dpy);
-+    xcb_connection_t *c = XGetXCBConnection(dpy);
- #else
-     xGLXRenderReq *req;
- #endif /* USE_XCB */
-@@ -1292,7 +1292,7 @@
- 
-     if ( (dpy != NULL) && (size > 0) ) {
- #ifdef USE_XCB
--	XCBGlxRender(c, ctx->currentContextTag, size, (char *)ctx->buf);
-+	xcb_glx_render(c, ctx->currentContextTag, size, (char *)ctx->buf);
- #else
- 	/* Send the entire buffer as an X request */
- 	LockDisplay(dpy);
-@@ -1335,8 +1335,8 @@
- {
-     Display *dpy = gc->currentDpy;
- #ifdef USE_XCB
--    XCBConnection *c = XCBConnectionOfDisplay(dpy);
--    XCBGlxRenderLarge(c, gc->currentContextTag, requestNumber, totalRequests, dataLen, data);
-+    xcb_connection_t *c = XGetXCBConnection(dpy);
-+    xcb_glx_render_large(c, gc->currentContextTag, requestNumber, totalRequests, dataLen, data);
- #else
-     xGLXRenderLargeReq *req;
-     
diff --git a/media-libs/mesa/files/6.5.1-xcb-dont-unlock-twice.patch b/media-libs/mesa/files/6.5.1-xcb-dont-unlock-twice.patch
deleted file mode 100644
index be68fcc7f53d..000000000000
--- a/media-libs/mesa/files/6.5.1-xcb-dont-unlock-twice.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/glx/x11/glxext.c
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/glx/x11/glxext.c,v
-retrieving revision 1.27
-diff -u -b -B -r1.27 glxext.c
---- src/glx/x11/glxext.c	7 Oct 2006 02:52:18 -0000	1.27
-+++ src/glx/x11/glxext.c	9 Oct 2006 00:54:05 -0000
-@@ -1016,11 +1016,11 @@
- 	if (!_XReply(dpy, (xReply*) &reply, 0, False)) {
- 	    /* Something is busted. Punt. */
- 	    UnlockDisplay(dpy);
-+	    SyncHandle();
- 	    FreeScreenConfigs(priv);
- 	    return GL_FALSE;
- 	}
- 
--	UnlockDisplay(dpy);
- 	if (!reply.numVisuals) {
- 	    /* This screen does not support GL rendering */
- 	    UnlockDisplay(dpy);
diff --git a/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch b/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch
deleted file mode 100644
index 5ea692419250..000000000000
--- a/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-14 11:09:54.000000000 -0700
-@@ -58,7 +58,7 @@
- 
- #ifndef DEFAULT_DRIVER_DIR
- /* this is normally defined in the Imakefile */
--#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri"
-+#define DEFAULT_DRIVER_DIR "/usr/lib/dri"
- #endif
- 
- static __DRIdriver *Drivers = NULL;
diff --git a/media-libs/mesa/files/digest-mesa-6.5-r3 b/media-libs/mesa/files/digest-mesa-6.5-r3
deleted file mode 100644
index 79639c7ca0fc..000000000000
--- a/media-libs/mesa/files/digest-mesa-6.5-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
-RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
-SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
diff --git a/media-libs/mesa/files/digest-mesa-6.5.1-r1 b/media-libs/mesa/files/digest-mesa-6.5.1-r1
deleted file mode 100644
index 45b5cf135d2d..000000000000
--- a/media-libs/mesa/files/digest-mesa-6.5.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
diff --git a/media-libs/mesa/files/digest-mesa-6.5.1-r4 b/media-libs/mesa/files/digest-mesa-6.5.1-r4
deleted file mode 100644
index 45b5cf135d2d..000000000000
--- a/media-libs/mesa/files/digest-mesa-6.5.1-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
-RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
-SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
diff --git a/media-libs/mesa/mesa-6.5-r3.ebuild b/media-libs/mesa/mesa-6.5-r3.ebuild
deleted file mode 100644
index 5d81dd4058b9..000000000000
--- a/media-libs/mesa/mesa-6.5-r3.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.18 2007/10/09 08:23:57 dberkholz Exp $
-
-inherit eutils toolchain-funcs multilib flag-o-matic portability
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV}"
-MY_SRC_P="${MY_PN}Lib-${PV}"
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ppc64 sh sparc ~x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_none
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS}
-	debug
-	doc
-	hardened
-	motif
-	nptl"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-libs/libdrm-2.0.1
-	x11-libs/libICE
-	motif? ( virtual/motif )
-	doc? ( app-doc/opengl-manpages )
-	!<=x11-base/xorg-x11-6.9"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-proto/inputproto
-	x11-proto/xextproto
-	app-admin/eselect-opengl
-	!hppa? ( x11-proto/xf86driproto )
-	x11-proto/xf86vidmodeproto
-	>=x11-proto/glproto-1.4.4
-	motif? ( x11-proto/printproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-pkg_setup() {
-	if use debug; then
-		strip-flags
-		append-flags -g
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# gcc 4.2 has buggy ivopts
-	if [[ $(gcc-version) = "4.2" ]]; then
-		append-flags -fno-ivopts
-	fi
-
-	if [[ ${KERNEL} == "FreeBSD" ]]; then
-		CONFIG="freebsd"
-	elif use x86; then
-		CONFIG="linux-dri-x86"
-	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}"/6.4-dont-install-gles-headers.patch
-	epatch "${FILESDIR}"/change-default-dri-driver-dir-X7.1.patch
-	epatch "${FILESDIR}"/6.4-multilib-fix.patch
-	epatch "${FILESDIR}"/6.5-re-order-context-destruction.patch
-
-	# Don't compile debug code with USE=-debug - bug #125004
-	if ! use debug; then
-	   einfo "Removing DO_DEBUG defs in dri drivers..."
-	   find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;
-	fi
-
-	# Set default dri drivers directory
-	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> "${HOSTCONF}"
-
-	# Do we want thread-local storage (TLS)?
-	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
-	fi
-
-	# Configurable DRI drivers
-	if use video_cards_i810; then
-		add_drivers i810 i915
-	fi
-	if use video_cards_mach64; then
-		add_drivers mach64
-	fi
-	if use video_cards_mga; then
-		add_drivers mga
-	fi
-	if use video_cards_r128; then
-		add_drivers r128
-	fi
-	if use video_cards_radeon; then
-		add_drivers radeon r200 r300
-	fi
-	if use video_cards_s3virge; then
-		add_drivers s3v
-	fi
-	if use video_cards_savage; then
-		add_drivers savage
-	fi
-	if use video_cards_sis; then
-		add_drivers sis
-	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
-	if use video_cards_tdfx; then
-		add_drivers tdfx
-	fi
-	if use video_cards_trident; then
-		add_drivers trident
-	fi
-	if use video_cards_via; then
-		add_drivers unichrome
-	fi
-
-	# Defaults based on X.Org 6.9, with some changes
-	if [[ ! -n "${VIDEO_CARDS}" ]]; then
-		if use alpha; then
-			add_drivers mga tdfx r128 r200 r300 radeon
-		elif use amd64; then
-			add_drivers i915 mga r128 r200 r300 radeon tdfx
-		elif use arm; then
-			add_drivers mga r128 r200 r300 radeon
-		elif use hppa; then
-			# no accelerated 3D on hppa
-			true
-		elif use ia64; then
-			add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome
-		elif use mips; then
-			# no accelerated 3D on mips
-			true
-		elif use ppc; then
-			add_drivers mach64 mga r128 r200 r300 radeon tdfx
-		elif use ppc64; then
-			add_drivers mga r128 r200 r300 radeon
-		elif use sparc; then
-			add_drivers ffb mach64
-		elif use x86; then
-			add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \
-				sis tdfx trident unichrome
-		fi
-	fi
-
-	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
-
-	if use hardened; then
-		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> "${HOSTCONF}"
-		echo "ASM_SOURCES =" >> "${HOSTCONF}"
-		echo "ASM_API =" >> "${HOSTCONF}"
-	fi
-
-	if use sparc; then
-		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> "${HOSTCONF}"
-		echo "ASM_SOURCES =" >> "${HOSTCONF}"
-	fi
-
-	# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
-	# build.
-	echo "EXTRA_LIB_PATH =" >> "${HOSTCONF}"
-
-	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
-	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
-	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
-	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> "${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}"
-
-	# Get rid of glut includes
-	rm -f "${S}"/include/GL/glut*h
-
-	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> "${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 += -lXm" >> "${HOSTCONF}"
-		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make \
-		DESTDIR=${D}/usr \
-		INCLUDE_DIR=${D}/usr/include \
-		LIB_DIR=${D}/usr/$(get_libdir) \
-		install || die "Installation failed"
-
-	##
-	# Install the actual drivers --- 'make install' doesn't install them
-	# anywhere.
-	dodir /usr/$(get_libdir)/dri
-	exeinto /usr/$(get_libdir)/dri
-	ebegin "Installing drivers to /usr/$(get_libdir)/dri"
-	DRI_SO=$(find ${S}/lib* -name '*_dri.so')
-	doexe ${DRI_SO}
-	eend $?
-
-	if ! use motif; then
-		rm "${D}"/usr/include/GL/GLwMDrawA.h
-	fi
-
-	# Don't install private headers
-	rm "${D}"/usr/include/GL/GLw*P.h
-
-	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
-	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
-		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# On *BSD libcs dlopen() and similar functions are present directly in
-	# libc.so and does not require linking to libdl. portability eclass takes
-	# care of finding the needed library (if needed) witht the dlopen_lib
-	# function.
-	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		"${D}"/usr/$(get_libdir)/libGLU.la \
-		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# Create the two-number versioned libs (.so.#.#), since only .so.# and
-	# .so.#.#.# were made
-	dosym libGLU.so.1.3.060500 /usr/$(get_libdir)/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
-
-	# libGLU doesn't get the plain .so symlink either
-	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
-
-	# 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
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# FreeBSD doesn't use major.minor versioning, so the library is only
-		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
-		# libGL.so symlink and leave libGL.so.1 being the real thing
-		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
-	else
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-	fi
-}
-
-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} || -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} || -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
-		eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-add_drivers() {
-	DRI_DRIVERS="${DRI_DRIVERS} $@"
-}
diff --git a/media-libs/mesa/mesa-6.5.1-r1.ebuild b/media-libs/mesa/mesa-6.5.1-r1.ebuild
deleted file mode 100644
index b3fd82bae8a2..000000000000
--- a/media-libs/mesa/mesa-6.5.1-r1.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r1.ebuild,v 1.17 2007/10/09 08:23:57 dberkholz Exp $
-
-inherit eutils toolchain-funcs multilib flag-o-matic portability
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV}"
-MY_SRC_P="${MY_PN}Lib-${PV}"
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_none
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS}
-	debug
-	doc
-	hardened
-	motif
-	nptl"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-libs/libdrm-2.0.2
-	x11-libs/libICE
-	motif? ( virtual/motif )
-	doc? ( app-doc/opengl-manpages )
-	!<=x11-base/xorg-x11-6.9"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-misc/makedepend
-	x11-proto/inputproto
-	x11-proto/xextproto
-	app-admin/eselect-opengl
-	!hppa? ( x11-proto/xf86driproto )
-	x11-proto/xf86vidmodeproto
-	>=x11-proto/glproto-1.4.8
-	motif? ( x11-proto/printproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-pkg_setup() {
-	if use debug; then
-		strip-flags
-		append-flags -g
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# gcc 4.2 has buggy ivopts
-	if [[ $(gcc-version) = "4.2" ]]; then
-		append-flags -fno-ivopts
-	fi
-
-	if use x86-fbsd; then
-		CONFIG="freebsd-dri-x86"
-	elif use amd64-fbsd; then
-		CONFIG="freebsd-dri-amd64"
-	elif use kernel_FreeBSD; then
-		CONFIG="freebsd-dri"
-	elif use x86 ; then
-		CONFIG="linux-dri-x86"
-	elif use amd64; then
-		[[ ${ABI} == "amd64" ]] && CONFIG="linux-dri-x86-64"
-		[[ ${ABI} == "x86" ]] && CONFIG="linux-dri-x86"
-	elif use ppc; then
-		CONFIG="linux-dri-ppc"
-	else
-		CONFIG="linux-dri"
-	fi
-}
-
-src_unpack() {
-	HOSTCONF="${S}/configs/${CONFIG}"
-
-	unpack ${A}
-	# Fixes for bug #146892
-	epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch
-	cd "${S}"
-	# FreeBSD 6.* doesn't have posix_memalign().
-	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
-
-	# Don't compile debug code with USE=-debug - bug #125004
-	if ! use debug; then
-	   einfo "Removing DO_DEBUG defs in dri drivers..."
-	   find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;
-	fi
-
-	# Set up libdir
-	echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
-
-	# Set default dri drivers directory
-	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
-
-	# Do we want thread-local storage (TLS)?
-	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
-	fi
-
-	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
-
-	# Configurable DRI drivers
-	if use video_cards_i810; then
-		add_drivers i810 i915 i965
-	fi
-	if use video_cards_mach64; then
-		add_drivers mach64
-	fi
-	if use video_cards_mga; then
-		add_drivers mga
-	fi
-	if use video_cards_r128; then
-		add_drivers r128
-	fi
-	if use video_cards_radeon; then
-		add_drivers radeon r200 r300
-	fi
-	if use video_cards_s3virge; then
-		add_drivers s3v
-	fi
-	if use video_cards_savage; then
-		add_drivers savage
-	fi
-	if use video_cards_sis; then
-		add_drivers sis
-	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
-	if use video_cards_tdfx; then
-		add_drivers tdfx
-	fi
-	if use video_cards_trident; then
-		add_drivers trident
-	fi
-	if use video_cards_via; then
-		add_drivers unichrome
-	fi
-
-	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
-
-	if use hardened; then
-		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> "${HOSTCONF}"
-		echo "ASM_SOURCES =" >> "${HOSTCONF}"
-		echo "ASM_API =" >> "${HOSTCONF}"
-	fi
-
-	if use sparc; then
-		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> "${HOSTCONF}"
-		echo "ASM_SOURCES =" >> "${HOSTCONF}"
-	fi
-
-	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
-
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
-	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
-	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
-	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
-	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> "${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}"
-
-	# Get rid of glut includes
-	rm -f "${S}"/include/GL/glut*h
-
-	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> "${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 += -lXm" >> "${HOSTCONF}"
-		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make \
-		INSTALL_DIR="${D}/usr" \
-		DRI_DRIVER_INSTALL_DIR="${D}/usr/\$(LIB_DIR)/dri" \
-		INCLUDE_DIR="${D}/usr/include" \
-		install || die "Installation failed"
-
-	if ! use motif; then
-		rm "${D}"/usr/include/GL/GLwMDrawA.h
-	fi
-
-	# Don't install private headers
-	rm "${D}"/usr/include/GL/GLw*P.h
-
-	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
-	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
-		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# On *BSD libcs dlopen() and similar functions are present directly in
-	# libc.so and does not require linking to libdl. portability eclass takes
-	# care of finding the needed library (if needed) witht the dlopen_lib
-	# function.
-	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		"${D}"/usr/$(get_libdir)/libGLU.la \
-		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# Create the two-number versioned libs (.so.#.#), since only .so.# and
-	# .so.#.#.# were made
-	dosym libGLU.so.1.3.060501 /usr/$(get_libdir)/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
-
-	# libGLU doesn't get the plain .so symlink either
-	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
-
-	# 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
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# FreeBSD doesn't use major.minor versioning, so the library is only
-		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
-		# libGL.so symlink and leave libGL.so.1 being the real thing
-		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
-	else
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-	fi
-}
-
-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} || -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} || -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
-		eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-add_drivers() {
-	DRI_DRIVERS="${DRI_DRIVERS} $@"
-}
diff --git a/media-libs/mesa/mesa-6.5.1-r4.ebuild b/media-libs/mesa/mesa-6.5.1-r4.ebuild
deleted file mode 100644
index ead8e31887ca..000000000000
--- a/media-libs/mesa/mesa-6.5.1-r4.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r4.ebuild,v 1.7 2007/10/09 08:23:57 dberkholz Exp $
-
-inherit eutils toolchain-funcs multilib flag-o-matic portability
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV}"
-MY_SRC_P="${MY_PN}Lib-${PV}"
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_none
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS}
-	debug
-	doc
-	hardened
-	motif
-	nptl
-	xcb"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-libs/libdrm-2.2
-	x11-libs/libICE
-	motif? ( virtual/motif )
-	doc? ( app-doc/opengl-manpages )
-	!<=x11-base/xorg-x11-6.9
-	xcb? ( x11-libs/libxcb )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-misc/makedepend
-	x11-proto/inputproto
-	x11-proto/xextproto
-	app-admin/eselect-opengl
-	!hppa? ( x11-proto/xf86driproto )
-	x11-proto/xf86vidmodeproto
-	>=x11-proto/glproto-1.4.8
-	motif? ( x11-proto/printproto )"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-pkg_setup() {
-	if use xcb; then
-		if ! built_with_use x11-libs/libX11 xcb; then
-			msg="You must build libX11 with xcb enabled."
-			eerror ${msg}
-			die ${msg}
-		fi
-	fi
-
-	if use debug; then
-		strip-flags
-		append-flags -g
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# gcc 4.2 has buggy ivopts
-	if [[ $(gcc-version) = "4.2" ]]; then
-		append-flags -fno-ivopts
-	fi
-
-	if use x86-fbsd; then
-		CONFIG="freebsd-dri-x86"
-	elif use amd64-fbsd; then
-		CONFIG="freebsd-dri-amd64"
-	elif use kernel_FreeBSD; then
-		CONFIG="freebsd-dri"
-	elif use x86; then
-		CONFIG="linux-dri-x86"
-	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}
-	# Fixes for bug #146892
-	epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch
-	cd "${S}"
-	# FreeBSD 6.* doesn't have posix_memalign().
-	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
-
-	# Fixes for fd.o bug #8521
-	epatch "${FILESDIR}"/${PV}-xcb-dont-unlock-twice.patch
-
-	# Use XCB API as of 1.0RC2
-	epatch "${FILESDIR}"/${PV}-use-new-xcb-naming.patch
-
-	# Fix compile against newer libdrm bug #154827
-	epatch "${FILESDIR}"/${PV}-mach64-dri-private-dma-2.patch
-
-	# Fix 965 driver bug #156569
-	epatch "${FILESDIR}"/${PV}-i965-bufmgr.patch
-
-	# Don't compile debug code with USE=-debug - bug #125004
-	if ! use debug; then
-	   einfo "Removing DO_DEBUG defs in dri drivers..."
-	   find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;
-	fi
-
-	# Set up libdir
-	echo "LIB_DIR = $(get_libdir)" >> "${HOSTCONF}"
-
-	# Set default dri drivers directory
-	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
-
-	# Do we want thread-local storage (TLS)?
-	if use nptl; then
-		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> "${HOSTCONF}"
-	fi
-
-	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> "${HOSTCONF}"
-	if use xcb; then
-		echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}"
-		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> "${HOSTCONF}"
-		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> "${HOSTCONF}"
-	fi
-
-	# Configurable DRI drivers
-	if use video_cards_i810; then
-		add_drivers i810 i915 i965
-	fi
-	if use video_cards_mach64; then
-		add_drivers mach64
-	fi
-	if use video_cards_mga; then
-		add_drivers mga
-	fi
-	if use video_cards_r128; then
-		add_drivers r128
-	fi
-	if use video_cards_radeon; then
-		add_drivers radeon r200 r300
-	fi
-	if use video_cards_s3virge; then
-		add_drivers s3v
-	fi
-	if use video_cards_savage; then
-		add_drivers savage
-	fi
-	if use video_cards_sis; then
-		add_drivers sis
-	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
-	if use video_cards_tdfx; then
-		add_drivers tdfx
-	fi
-	if use video_cards_trident; then
-		add_drivers trident
-	fi
-	if use video_cards_via; then
-		add_drivers unichrome
-	fi
-
-	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
-
-	if use hardened; then
-		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> "${HOSTCONF}"
-		echo "ASM_SOURCES =" >> "${HOSTCONF}"
-		echo "ASM_API =" >> "${HOSTCONF}"
-	fi
-
-	if use sparc; then
-		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> "${HOSTCONF}"
-		echo "ASM_SOURCES =" >> "${HOSTCONF}"
-	fi
-
-	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> "${HOSTCONF}"
-
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> "${HOSTCONF}"
-	echo "OPT_FLAGS = ${CFLAGS}" >> "${HOSTCONF}"
-	echo "CC = $(tc-getCC)" >> "${HOSTCONF}"
-	echo "CXX = $(tc-getCXX)" >> "${HOSTCONF}"
-	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> "${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}"
-
-	# Get rid of glut includes
-	rm -f "${S}"/include/GL/glut*h
-
-	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> "${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 += -lXm" >> "${HOSTCONF}"
-		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> "${HOSTCONF}"
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make \
-		INSTALL_DIR="${D}/usr" \
-		DRI_DRIVER_INSTALL_DIR="${D}/usr/\$(LIB_DIR)/dri" \
-		INCLUDE_DIR="${D}/usr/include" \
-		install || die "Installation failed"
-
-	if ! use motif; then
-		rm "${D}"/usr/include/GL/GLwMDrawA.h
-	fi
-
-	# Don't install private headers
-	rm "${D}"/usr/include/GL/GLw*P.h
-
-	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
-	sed -e "s:\${libdir}:$(get_libdir):g" "${FILESDIR}"/lib/libGL.la \
-		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# On *BSD libcs dlopen() and similar functions are present directly in
-	# libc.so and does not require linking to libdl. portability eclass takes
-	# care of finding the needed library (if needed) witht the dlopen_lib
-	# function.
-	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
-		"${D}"/usr/$(get_libdir)/libGLU.la \
-		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
-
-	# Create the two-number versioned libs (.so.#.#), since only .so.# and
-	# .so.#.#.# were made
-	dosym libGLU.so.1.3.060501 /usr/$(get_libdir)/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
-
-	# libGLU doesn't get the plain .so symlink either
-	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
-
-	# 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
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# FreeBSD doesn't use major.minor versioning, so the library is only
-		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
-		# libGL.so symlink and leave libGL.so.1 being the real thing
-		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
-	else
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-	fi
-}
-
-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} || -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} || -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
-		eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-add_drivers() {
-	DRI_DRIVERS="${DRI_DRIVERS} $@"
-}