Pull old ebuilds that aren't latest stable, ~arch, or RC.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64

8 files changed, 12 insertions, 964 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index a8b51c72d752..c1ae861df6ef 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.178 2008/07/08 22:08:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.179 2008/07/08 22:10:50 dberkholz Exp $
+
+  08 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch,
+  -files/7.0.2-glw.pc.in,
+  -files/0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch,
+  -files/version.mk, -mesa-7.0.2.ebuild, -mesa-7.1_rc1.ebuild:
+  Pull old ebuilds that aren't latest stable, ~arch, or RC.
 
 *mesa-7.1_rc2 (08 Jul 2008)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 43b7334a16a4..cb6531caceb7 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,30 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch 1725 RMD160 2d4959c708e0b2c2d9baf90abbd85e0a5555e780 SHA1 752876f27385ceb155b6a417efa6d3b7186fa3a0 SHA256 a58c7a7198f1e41a5570de651d0cd606ff911206cb7d924e1e4caf9aa879b322
-AUX 0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch 8184 RMD160 736e576ed70bc71bfb2f54239c3c924bb99b8c55 SHA1 0f445f6e6f73ec26921afd2b162b9c95d70a8997 SHA256 c64b67202407ff762b43b563050f215b5ba5d9d0ed17455c9fd8798bef22d1ac
 AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a50 SHA1 741221fba69b3891665e16da5baf6e66be62449d SHA256 bc19f4b5ce44a90c6b2aeab2c1148200539791ff9d0c60c5ffc2d4d8fe5fee78
-AUX 7.0.2-glw.pc.in 235 RMD160 12923cc447a04eab42c98fac48e17b8828cfbcf8 SHA1 dc0bc9ff1b2f2aa5efc101b62e2cf1870195ecfe SHA256 1b484764cb1274dc6a29998b63d3a9aa6282fb1fb31d53ac7928724a2f288dfc
 AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91
 AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5
 AUX src-mesa-drivers-Makefile 460 RMD160 31aa1fb7de34423ff28f22df848b2b22db07b928 SHA1 20449452d011b0ee5a2a82702a9c0cc88d5864c8 SHA256 6ba5c3da59d158a25928aba00ab462f71769d8416b9513be3d654a1bdf17ecd2
-AUX version.mk 341 RMD160 274c76da254fc922efb8060bc074c3c61d63eef2 SHA1 6c3d7d8826d0fa4372a41a73879e01453bf62ea0 SHA256 534e295f28e0c188a00722b101eefa18a3a4a2917f190838a4d08baf0ae1af5f
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
-DIST MesaLib-7.0.2.tar.bz2 3353217 RMD160 3d471062b60889baef48a1a4596de6e32e1530cf SHA1 d16eaeb1d9d95d11d3b6d289b1ba87108b88da90 SHA256 9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
 DIST MesaLib-7.0.3.tar.bz2 3389327 RMD160 1672be9d235f19c779c42ea4f443995b1844c836 SHA1 49b92094a25f189b411f393174ee666e73dddf36 SHA256 ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
-DIST MesaLib-7.1-rc1.tar.gz 4495101 RMD160 2468daa0fe177462fdf3f5e222012377aadfc99e SHA1 f4d5a74251577ffa5e6fe14117209c0b3f2fdb8c SHA256 d1aa69223b13ce7a6aac92e7c11a83140cae69b7913a9e879481385e8ec17ae7
 DIST MesaLib-7.1-rc2.tar.gz 4526392 RMD160 e23bc5b9c9f80bbcdabbcce83f4a960492df3a98 SHA1 b039b1dee62bc9b41835a13d0a16e62dd55e1cad SHA256 b6dff2ab423716f1219a34f9f3a3c0c2d49c291728a9c6a826b1ff5c66b703fb
 EBUILD mesa-6.5.2-r1.ebuild 9092 RMD160 bd563c07923b51075c0f954d91c6ab25cc359d92 SHA1 6b8c6d996a7d10e61db90ae5296e3f8c7122938c SHA256 69f5fe44667201b6b57bb5f46b377857f96fadf31880a72d797cd90ba6086d22
-EBUILD mesa-7.0.2.ebuild 9948 RMD160 90dd90f1c7078730af0d6d2f26397d16fd021297 SHA1 2e037d9ec5e988f55355330ccf65b69e135b1921 SHA256 786b2b690af732def65625a3af2854bb6601c89b7ec895f4a67c11a1dba21cac
 EBUILD mesa-7.0.3.ebuild 10137 RMD160 953e56dcfe83d94981c634926793626635ed1456 SHA1 8d2681358679a25c73ef6648aa322b83ce165707 SHA256 82ace13c9a192008b87ded31fa78110a36266dee4565f0d4f39eed97d3e81ac8
-EBUILD mesa-7.1_rc1.ebuild 7718 RMD160 8ec8a3d04770b0199a0585ac1665abf852eac6b3 SHA1 12918ef895dd1c92ab232c07937aa2c5d650d2b1 SHA256 999bd838d41c7934861b77b768aac6e3ee283519fa2c7d911ff8aa02c3742e37
 EBUILD mesa-7.1_rc2.ebuild 7586 RMD160 ace16bbc8c0db2dde86607f305d726fc43c5d4e1 SHA1 d8897a765da87de6cd509130a27315c3b1ae1dec SHA256 b8f5fd4c8332ba428b00bcd8fb475f033751742aa53c5d93f1b559767657ddaa
-MISC ChangeLog 33349 RMD160 93c2e86e61f9cf89a67496e17af49561311a9581 SHA1 328945d1ce1c00ec1da95b2ff6331180347b5e70 SHA256 768b3da88d13daa2d1544e344feb8efcaae3f483877a8e00cfedceac1bb7fe68
+MISC ChangeLog 33700 RMD160 a148269bcb38f5eeea3b7f32a491dd4d7412cfef SHA1 f4db9d3c9ff5d8143c18c2fd485719be1eec3dfd SHA256 01c000efe6598c9a0a6e4ae41af0f9bd44933e8c702b20542820f93ac3be282a
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhz5U4ACgkQXVaO67S1rtsu6gCgm6gSsocbhrtVQAGDYwo7hgCL
-3BgAmwRFIlsBGIrakwaKH/nYo660GDmw
-=i0sP
+iEYEARECAAYFAkhz5fAACgkQXVaO67S1rttxCQCg6QYDqe55+h4Uq4GHTELkOZ/p
+1WMAnRMbgq/RmPNyl2OCKl+cW8FbAuVK
+=2ZE8
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch b/media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch
deleted file mode 100644
index 4e1ea8f33fab..000000000000
--- a/media-libs/mesa/files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d3f7b463c3975c070503053e4ad70af99016a756 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@linux.ie>
-Date: Tue, 1 Jul 2008 18:22:12 +1000
-Subject: [PATCH] dri: drop asserts to make build against stable libdrm
-
-These asserts are of questionable use at the moment with things in flux.
----
- src/mesa/drivers/dri/common/dri_bufmgr.c |   11 -----------
- 1 files changed, 0 insertions(+), 11 deletions(-)
-
-diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.c b/src/mesa/drivers/dri/common/dri_bufmgr.c
-index 4df006f..8b5cb76 100644
---- a/src/mesa/drivers/dri/common/dri_bufmgr.c
-+++ b/src/mesa/drivers/dri/common/dri_bufmgr.c
-@@ -40,11 +40,6 @@ dri_bo *
- dri_bo_alloc(dri_bufmgr *bufmgr, const char *name, unsigned long size,
- 	     unsigned int alignment, uint64_t location_mask)
- {
--   assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT |
--			     DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 |
--			     DRM_BO_FLAG_MEM_PRIV1 | DRM_BO_FLAG_MEM_PRIV2 |
--			     DRM_BO_FLAG_MEM_PRIV3 | DRM_BO_FLAG_MEM_PRIV4 |
--			     DRM_BO_FLAG_CACHED | DRM_BO_FLAG_CACHED_MAPPED)) == 0);
-    return bufmgr->bo_alloc(bufmgr, name, size, alignment, location_mask);
- }
- 
-@@ -53,12 +48,6 @@ dri_bo_alloc_static(dri_bufmgr *bufmgr, const char *name, unsigned long offset,
- 		    unsigned long size, void *virtual,
- 		    uint64_t location_mask)
- {
--   assert((location_mask & ~(DRM_BO_FLAG_MEM_LOCAL | DRM_BO_FLAG_MEM_TT |
--			     DRM_BO_FLAG_MEM_VRAM | DRM_BO_FLAG_MEM_PRIV0 |
--			     DRM_BO_FLAG_MEM_PRIV1 | DRM_BO_FLAG_MEM_PRIV2 |
--			     DRM_BO_FLAG_MEM_PRIV3 |
--			     DRM_BO_FLAG_MEM_PRIV4)) == 0);
--
-    return bufmgr->bo_alloc_static(bufmgr, name, offset, size, virtual,
- 				  location_mask);
- }
--- 
-1.5.5.4
-
diff --git a/media-libs/mesa/files/0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch b/media-libs/mesa/files/0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch
deleted file mode 100644
index 3399152af834..000000000000
--- a/media-libs/mesa/files/0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 0b734bd7cf921592eee441f759687e10f48a2cbc Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 28 May 2008 15:55:44 +1000
-Subject: [PATCH] mesa/drm/ttm: allow build against non-TTM aware libdrm
-
-I'll release a libdrm 2.3.1 without TTM apis included from a special
-drm branch that should allow mesa 7.1 to build against it.
-
-I've had to turn off DRI2 stuff.
----
- configure.ac                                  |   18 ++++++++++++
- src/mesa/drivers/dri/common/dri_bufmgr.h      |   38 +++++++++++++++++++++++++
- src/mesa/drivers/dri/common/dri_util.c        |    6 ++++
- src/mesa/drivers/dri/common/dri_util.h        |    3 +-
- src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c |   20 +++++++++++++
- src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h |    8 +++++
- src/mesa/drivers/dri/intel/intel_ioctl.c      |   10 ++++++
- 7 files changed, 102 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a250f75..a73c754 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -478,6 +478,19 @@ AC_ARG_ENABLE([driglx-direct],
-         [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])],
-     [driglx_direct="$enableval"],
-     [driglx_direct="yes"])
-+dnl ttm support
-+AC_ARG_ENABLE([ttm-api],
-+    [AS_HELP_STRING([--enable-ttm-api],
-+	[enable TTM API users])],
-+    [ttmapi="$enableval"],
-+    [ttmapi="no"])
-+
-+if test "x$ttmapi" = "xyes"; then
-+    save_CFLAGS=$CFLAGS
-+    CFLAGS=$LIBDRM_CFLAGS
-+    AC_CHECK_HEADERS([xf86mm.h],[],[AC_MSG_ERROR([xf86mm.h required for TTM.])],[#include "stdint.h"\n#include "drm.h"])
-+    CFLAGS=$save_CFLAGS
-+fi
- 
- dnl Which drivers to build - default is chosen by platform
- AC_ARG_WITH([dri-drivers],
-@@ -516,6 +529,10 @@ if test "$mesa_driver" = dri; then
-         DEFINES="$DEFINES -DGLX_USE_TLS -DPTHREADS"
-     fi
- 
-+    if test "x$ttmapi" = xyes; then
-+        DEFINES="$DEFINES -DTTM_API"
-+    fi
-+
-     if test "x$USING_EGL" = x1; then
-         PROGRAM_DIRS="egl"
-     fi
-@@ -934,6 +951,7 @@ if test "$mesa_driver" = dri; then
-     dri_dirs=`echo $DRI_DIRS | $SED 's/^ *//;s/  */ /;s/ *$//'`
-     echo "        DRI drivers:     $dri_dirs"
-     echo "        DRI driver dir:  $DRI_DRIVER_INSTALL_DIR"
-+    echo "        TTM API support: $ttmapi"
- fi
- 
- dnl Libraries
-diff --git a/src/mesa/drivers/dri/common/dri_bufmgr.h b/src/mesa/drivers/dri/common/dri_bufmgr.h
-index 4593eaf..0a726dc 100644
---- a/src/mesa/drivers/dri/common/dri_bufmgr.h
-+++ b/src/mesa/drivers/dri/common/dri_bufmgr.h
-@@ -219,4 +219,42 @@ void dri_post_process_relocs(dri_bo *batch_buf);
- void dri_post_submit(dri_bo *batch_buf, dri_fence **last_fence);
- int dri_bufmgr_check_aperture_space(dri_bo *bo);
- 
-+#ifndef TTM_API
-+/* reuse some TTM API */
-+
-+#define DRM_BO_MEM_LOCAL 0
-+#define DRM_BO_MEM_TT 1
-+#define DRM_BO_MEM_VRAM 2
-+#define DRM_BO_MEM_PRIV0 3
-+#define DRM_BO_MEM_PRIV1 4
-+#define DRM_BO_MEM_PRIV2 5
-+#define DRM_BO_MEM_PRIV3 6
-+#define DRM_BO_MEM_PRIV4 7
-+
-+#define DRM_BO_FLAG_READ        (1ULL << 0)
-+#define DRM_BO_FLAG_WRITE       (1ULL << 1)
-+#define DRM_BO_FLAG_EXE         (1ULL << 2)
-+#define DRM_BO_MASK_ACCESS	(DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_EXE)
-+#define DRM_BO_FLAG_NO_EVICT    (1ULL << 4)
-+
-+#define DRM_BO_FLAG_MAPPABLE    (1ULL << 5)
-+#define DRM_BO_FLAG_SHAREABLE   (1ULL << 6)
-+
-+#define DRM_BO_FLAG_CACHED      (1ULL << 7)
-+
-+#define DRM_BO_FLAG_NO_MOVE     (1ULL << 8)
-+#define DRM_BO_FLAG_CACHED_MAPPED    (1ULL << 19)
-+#define DRM_BO_FLAG_FORCE_CACHING  (1ULL << 13)
-+#define DRM_BO_FLAG_FORCE_MAPPABLE (1ULL << 14)
-+#define DRM_BO_FLAG_TILE           (1ULL << 15)
-+
-+#define DRM_BO_FLAG_MEM_LOCAL  (1ULL << 24)
-+#define DRM_BO_FLAG_MEM_TT     (1ULL << 25)
-+#define DRM_BO_FLAG_MEM_VRAM   (1ULL << 26)
-+
-+#define DRM_BO_MASK_MEM         0x00000000FF000000ULL
-+
-+#define DRM_FENCE_TYPE_EXE                 0x00000001
-+#endif
-+
- #endif
-diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
-index daa3fc5..6efdf43 100644
---- a/src/mesa/drivers/dri/common/dri_util.c
-+++ b/src/mesa/drivers/dri/common/dri_util.c
-@@ -771,8 +771,10 @@ static void driDestroyScreen(__DRIscreen *psp)
- 	    (*psp->DriverAPI.DestroyScreen)(psp);
- 
- 	if (psp->dri2.enabled) {
-+#ifdef TTM_API
- 	    drmBOUnmap(psp->fd, &psp->dri2.sareaBO);
- 	    drmBOUnreference(psp->fd, &psp->dri2.sareaBO);
-+#endif
- 	} else {
- 	   (void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX);
- 	   (void)drmUnmap((drmAddress)psp->pFB, psp->fbSize);
-@@ -904,6 +906,7 @@ dri2CreateNewScreen(int scrn, int fd, unsigned int sarea_handle,
- 		    const __DRIextension **extensions,
- 		    const __DRIconfig ***driver_configs, void *data)
- {
-+#ifdef TTM_API
-     static const __DRIextension *emptyExtensionList[] = { NULL };
-     __DRIscreen *psp;
-     unsigned int *p;
-@@ -971,6 +974,9 @@ dri2CreateNewScreen(int scrn, int fd, unsigned int sarea_handle,
-     psp->DriverAPI = driDriverAPI;
- 
-     return psp;
-+#else
-+    return NULL;
-+#endif
- }
- 
- static const __DRIextension **driGetExtensions(__DRIscreen *psp)
-diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
-index 8e1cdfc..203479e 100644
---- a/src/mesa/drivers/dri/common/dri_util.h
-+++ b/src/mesa/drivers/dri/common/dri_util.h
-@@ -53,7 +53,6 @@
- #include <drm.h>
- #include <drm_sarea.h>
- #include <xf86drm.h>
--#include <xf86mm.h>
- #include "GL/internal/glcore.h"
- #include "GL/internal/dri_interface.h"
- #include "GL/internal/dri_sarea.h"
-@@ -524,7 +523,9 @@ struct __DRIscreenRec {
- 	/* Flag to indicate that this is a DRI2 screen.  Many of the above
- 	 * fields will not be valid or initializaed in that case. */
- 	int enabled;
-+#ifdef TTM_API
- 	drmBO sareaBO;
-+#endif
- 	void *sarea;
- 	__DRIEventBuffer *buffer;
- 	__DRILock *lock;
-diff --git a/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c b/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
-index 545913f..194814e 100644
---- a/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
-+++ b/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.c
-@@ -50,6 +50,7 @@
- #include "i915_drm.h"
- 
- #include "intel_bufmgr_ttm.h"
-+#ifdef TTM_API
- 
- #define DBG(...) do {					\
-    if (bufmgr_ttm->bufmgr.debug)			\
-@@ -1099,4 +1100,23 @@ intel_bufmgr_ttm_init(int fd, unsigned int fence_type,
- 
-     return &bufmgr_ttm->bufmgr;
- }
-+#else
-+dri_bufmgr *
-+intel_bufmgr_ttm_init(int fd, unsigned int fence_type,
-+		      unsigned int fence_type_flush, int batch_size)
-+{
-+    return NULL;
-+}
-+
-+dri_bo *
-+intel_ttm_bo_create_from_handle(dri_bufmgr *bufmgr, const char *name,
-+			      unsigned int handle)
-+{
-+    return NULL;
-+}
- 
-+void
-+intel_ttm_enable_bo_reuse(dri_bufmgr *bufmgr)
-+{
-+}
-+#endif
-diff --git a/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h b/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h
-index d267a16..f5bd64c 100644
---- a/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h
-+++ b/src/mesa/drivers/dri/intel/intel_bufmgr_ttm.h
-@@ -7,8 +7,10 @@
- extern dri_bo *intel_ttm_bo_create_from_handle(dri_bufmgr *bufmgr, const char *name,
- 					       unsigned int handle);
- 
-+#ifdef TTM_API
- dri_fence *intel_ttm_fence_create_from_arg(dri_bufmgr *bufmgr, const char *name,
- 					   drm_fence_arg_t *arg);
-+#endif
- 
- 
- dri_bufmgr *intel_bufmgr_ttm_init(int fd, unsigned int fence_type,
-@@ -17,4 +19,10 @@ dri_bufmgr *intel_bufmgr_ttm_init(int fd, unsigned int fence_type,
- void
- intel_ttm_enable_bo_reuse(dri_bufmgr *bufmgr);
- 
-+#ifndef TTM_API
-+#define DRM_I915_FENCE_CLASS_ACCEL 0
-+#define DRM_I915_FENCE_TYPE_RW 2
-+#define DRM_I915_FENCE_FLAG_FLUSHED 0x01000000
-+#endif
-+
- #endif
-diff --git a/src/mesa/drivers/dri/intel/intel_ioctl.c b/src/mesa/drivers/dri/intel/intel_ioctl.c
-index 66e3610..f4566ba 100644
---- a/src/mesa/drivers/dri/intel/intel_ioctl.c
-+++ b/src/mesa/drivers/dri/intel/intel_ioctl.c
-@@ -147,6 +147,7 @@ intel_batch_ioctl(struct intel_context *intel,
-    }
- }
- 
-+#ifdef TTM_API
- void
- intel_exec_ioctl(struct intel_context *intel,
- 		 GLuint used,
-@@ -211,3 +212,12 @@ intel_exec_ioctl(struct intel_context *intel,
-    }
-    *fence = fo;
- }
-+#else
-+void
-+intel_exec_ioctl(struct intel_context *intel,
-+		 GLuint used,
-+		 GLboolean ignore_cliprects, GLboolean allow_unlock,
-+		 void *start, GLuint count, dri_fence **fence)
-+{
-+}
-+#endif
--- 
-1.5.5.3
-
diff --git a/media-libs/mesa/files/7.0.2-glw.pc.in b/media-libs/mesa/files/7.0.2-glw.pc.in
deleted file mode 100644
index 951e2dc2af5d..000000000000
--- a/media-libs/mesa/files/7.0.2-glw.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@INSTALL_DIR@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
-
-Name: glw
-Description: Mesa OpenGL widget library
-Requires: gl
-Version: @VERSION@
-Libs: -L${libdir} -lGLU
-Cflags: -I${includedir}
diff --git a/media-libs/mesa/files/version.mk b/media-libs/mesa/files/version.mk
deleted file mode 100755
index ab20d79daee4..000000000000
--- a/media-libs/mesa/files/version.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/make -sf
-# Print the various Mesa version fields. This is mostly used to add the
-# version to configure.
-
-# This reflects that this script is usually called from the toplevel
-TOP = .
-
-include $(TOP)/configs/default
-
-version:
-	@echo $(MESA_VERSION)
-major:
-	@echo $(MESA_MAJOR)
-minor:
-	@echo $(MESA_MINOR)
-tiny:
-	@echo $(MESA_TINY)
diff --git a/media-libs/mesa/mesa-7.0.2.ebuild b/media-libs/mesa/mesa-7.0.2.ebuild
deleted file mode 100644
index ac7541c95013..000000000000
--- a/media-libs/mesa/mesa-7.0.2.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.2.ebuild,v 1.7 2008/06/27 10:11:26 ulm Exp $
-
-inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
-
-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/"
-if [[ $PV = *_rc* ]]; then
-	SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz"
-else
-	SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
-fi
-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
-	pic
-	motif
-	nptl
-	xcb
-	kernel_FreeBSD"
-
-RDEPEND="app-admin/eselect-opengl
-	dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXdamage
-	>=x11-libs/libdrm-2.2
-	x11-libs/libICE
-	motif? ( x11-libs/openmotif )
-	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
-	!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
-		[[ ${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}
-	cd "${S}"
-
-	# Upstream forgot to include this file in tarball for 7.0.2
-	# but it's in git, so this is a copy from the git repository
-	cp "${FILESDIR}"/${PV}-glw.pc.in "${S}"/src/glw/glw.pc.in || die
-
-	# 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}"
-	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
-	driver_enable video_cards_i810 i810 i915 i915tex i965
-	driver_enable video_cards_mach64 mach64
-	driver_enable video_cards_mga mga
-	driver_enable video_cards_r128 r128
-	driver_enable video_cards_radeon radeon r200 r300
-	driver_enable video_cards_s3virge s3v
-	driver_enable video_cards_savage savage
-	driver_enable video_cards_sis sis
-	driver_enable video_cards_sunffb ffb
-	driver_enable video_cards_tdfx tdfx
-	driver_enable video_cards_trident trident
-	driver_enable video_cards_via unichrome
-
-	# Set drivers to everything on which we ran driver_enable()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> "${HOSTCONF}"
-
-	if use pic; then
-		einfo "Deactivating assembly code for pic 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
-
-	# 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
-
-	# Shut up pointless warnings
-#	echo "MKDEP = gcc -M" >> "${HOSTCONF}"
-#	echo "MKDEP_OPTIONS = -MF depend" >> "${HOSTCONF}"
-	echo "MKDEP_OPTIONS = -fdepend -I$(gcc-config -L)/include" >> "${HOSTCONF}"
-	echo "INSTALL_DIR = /usr" >> "${HOSTCONF}"
-	echo 'DRI_DRIVER_INSTALL_DIR = /usr/$(LIB_DIR)/dri' >> "${HOSTCONF}"
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	emake -j1 \
-		DESTDIR="${D}" \
-		install || die "Installation failed"
-
-	if ! use motif; then
-		rm "${D}"/usr/include/GL/GLwMDrawA.h
-	fi
-
-	# Don't install private headers
-	rm -f "${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
-	local MAJOR_2="$(printf "%.2i" $(get_version_component_range 1 ${PV}))"
-	local MINOR_2="$(printf "%.2i" $(get_version_component_range 2 ${PV}))"
-	local MICRO_2="$(printf "%.2i" $(get_version_component_range 3 ${PV}))"
-	dosym \
-		libGLU.so.1.3.${MAJOR_2}${MINOR_2}${MICRO_2} \
-		/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
-
-	# We need the outer check, because xorg-server may not be installed
-	# first, and built_with_use() dies if the package isn't installed.
-	if has_version x11-base/xorg-server; then
-		if built_with_use x11-base/xorg-server nptl; then
-			ewarn "Rebuild x11-base/xorg-server without USE=nptl"
-			ewarn "or AIGLX (compiz, etc.) will not work."
-			ewarn "This is because of a bug in the Mesa NPTL assembly code"
-			ewarn "in all Mesa 7.0.x versions (Mesa 6.x is OK)."
-		fi
-	fi
-}
-
-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} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
-			fi
-		done
-		# glext.h added for #54984
-		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-driver_enable() {
-	if use $1; then
-		shift
-		DRI_DRIVERS="${DRI_DRIVERS} $@"
-	fi
-}
diff --git a/media-libs/mesa/mesa-7.1_rc1.ebuild b/media-libs/mesa/mesa-7.1_rc1.ebuild
deleted file mode 100644
index baf88e9fe5b4..000000000000
--- a/media-libs/mesa/mesa-7.1_rc1.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1_rc1.ebuild,v 1.5 2008/07/01 08:35:09 dberkholz Exp $
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-inherit autotools multilib flag-o-matic git 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/"
-if [[ $PV = *_rc* ]]; then
-	SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz"
-elif [[ $PV = 9999 ]]; then
-	SRC_URI=""
-else
-	SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
-fi
-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
-	pic
-	motif
-	nptl
-	xcb
-	kernel_FreeBSD"
-
-RDEPEND="app-admin/eselect-opengl
-	dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXdamage
-	>=x11-libs/libdrm-2.3.1
-	x11-libs/libICE
-	motif? ( x11-libs/openmotif )
-	doc? ( app-doc/opengl-manpages )
-	!<=x11-base/xorg-x11-6.9"
-DEPEND="${RDEPEND}
-	!<=x11-proto/xf86driproto-2.0.3
-	dev-util/pkgconfig
-	x11-misc/makedepend
-	x11-proto/inputproto
-	x11-proto/xextproto
-	!hppa? ( x11-proto/xf86driproto )
-	x11-proto/dri2proto
-	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
-		append-flags -g
-	fi
-
-	# gcc 4.2 has buggy ivopts
-	if [[ $(gcc-version) = "4.2" ]]; then
-		append-flags -fno-ivopts
-	fi
-
-	# recommended by upstream
-	append-flags -ffast-math
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Disable TTM
-	epatch "${FILESDIR}/0001-mesa-drm-ttm-allow-build-against-non-TTM-aware-libd.patch"
-	epatch "${FILESDIR}/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch"
-
-	cp "${FILESDIR}/version.mk" bin/ || die
-
-	# FreeBSD 6.* doesn't have posix_memalign().
-	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
-
-	# 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
-
-	eautoconf
-}
-
-src_compile() {
-	local myconf
-
-	# This is where we might later change to build xlib/osmesa
-	myconf="${myconf} --with-driver=dri"
-
-	# No TTM
-	myconf="${myconf} --disable-ttm-api"
-
-	# Do we want thread-local storage (TLS)?
-	myconf="${myconf} $(use_enable nptl glx-tls)"
-
-	# Configurable DRI drivers
-	driver_enable swrast
-	driver_enable video_cards_i810 i810 i915 i965
-	driver_enable video_cards_mach64 mach64
-	driver_enable video_cards_mga mga
-	driver_enable video_cards_r128 r128
-	driver_enable video_cards_radeon radeon r200 r300
-	driver_enable video_cards_s3virge s3v
-	driver_enable video_cards_savage savage
-	driver_enable video_cards_sis sis
-	driver_enable video_cards_sunffb ffb
-	driver_enable video_cards_tdfx tdfx
-	driver_enable video_cards_trident trident
-	driver_enable video_cards_via unichrome
-
-	# Set drivers to everything on which we ran driver_enable()
-	myconf="${myconf} --with-dri-drivers=${DRI_DRIVERS}"
-
-	# Deactivate assembly code for pic build
-	myconf="${myconf} $(use_enable pic asm)"
-
-	# Sparc assembly code is not working
-	myconf="${myconf} $(use_enable sparc asm)"
-
-	myconf="${myconf} --disable-glut"
-
-	myconf="${myconf} --without-demos"
-
-	myconf="${myconf} $(use_enable xcb)"
-
-	# Get rid of glut includes
-	rm -f "${S}"/include/GL/glut*h
-
-	myconf="${myconf} $(use_enable motif glw)"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr
-	emake \
-		DESTDIR="${D}" \
-		install || die "Installation failed"
-
-	if ! use motif; then
-		rm "${D}"/usr/include/GL/GLwMDrawA.h
-	fi
-
-	# Don't install private headers
-	rm -f "${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
-
-	# 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
-
-	# We need the outer check, because xorg-server may not be installed
-	# first, and built_with_use() dies if the package isn't installed.
-	if has_version x11-base/xorg-server; then
-		if built_with_use x11-base/xorg-server nptl; then
-			ewarn "Rebuild x11-base/xorg-server without USE=nptl"
-			ewarn "or AIGLX (compiz, etc.) will not work."
-			ewarn "This is because of a bug in the Mesa NPTL assembly code"
-			ewarn "in all Mesa 7.0.x versions (Mesa 6.x is OK)."
-		fi
-	fi
-}
-
-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} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
-			fi
-		done
-		# glext.h added for #54984
-		for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS="${DRI_DRIVERS},$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS="${DRI_DRIVERS},${i}"
-				done
-			fi
-			;;
-	esac
-}