Clean out the old repos. And copy all still relevant ebuilds to the dev

overlay. Historic versions can be viewed at 
https://callisto.cs.kun.nl/svn/repos/portage.local for as long as it 
lasts.

svn path=/trunk/overlay/; revision=1

18 files changed, 705 insertions, 0 deletions

diff --git a/media-libs/glSDL/Manifest b/media-libs/glSDL/Manifest
new file mode 100644
index 0000000..5b1f8cf
--- /dev/null
+++ b/media-libs/glSDL/Manifest
@@ -0,0 +1,12 @@
+DIST glSDL-0.3.tar.gz 127459
+EBUILD glSDL-0.3.ebuild 1263 RMD160 af626925416cf47c760cae566bba38a55e8fef5e SHA1 0119e9e7f1d98c95ffb3412865a6e262cf5b344b SHA256 ef62bfc2658be93c0a3d7addee006411da108e3bb2184ec129fa18db72c3537c
+MD5 331b5c05a488be3fb9f16d0e3e4886cf glSDL-0.3.ebuild 1263
+RMD160 af626925416cf47c760cae566bba38a55e8fef5e glSDL-0.3.ebuild 1263
+SHA256 ef62bfc2658be93c0a3d7addee006411da108e3bb2184ec129fa18db72c3537c glSDL-0.3.ebuild 1263
+MISC NOTES 135 RMD160 fd682bcfccf939a04923a377e44a93dfb3208ff8 SHA1 280b5ece294c343433310e15080f94d614208fd9 SHA256 727845bd6d453a9befab34814327e40ef14959b1c23545a042fbc7125c9ef9b9
+MD5 80f34a533918e9933f197e8d20d865af NOTES 135
+RMD160 fd682bcfccf939a04923a377e44a93dfb3208ff8 NOTES 135
+SHA256 727845bd6d453a9befab34814327e40ef14959b1c23545a042fbc7125c9ef9b9 NOTES 135
+MD5 b381ff0422ad01c5edeb89f31b3f717f files/digest-glSDL-0.3 61
+RMD160 223a17c08d42421e12c71ab553e6ae69b47467df files/digest-glSDL-0.3 61
+SHA256 108c819d6f8803a221b97253008ca450ae70ebd8a6eb7bdff2e99f98357d5106 files/digest-glSDL-0.3 61
diff --git a/media-libs/glSDL/NOTES b/media-libs/glSDL/NOTES
new file mode 100644
index 0000000..d687149
--- /dev/null
+++ b/media-libs/glSDL/NOTES
@@ -0,0 +1,2 @@
+Not in the main tree. It allows SDL on top of opengl. This version is 
+outdated. Version 0.6 is out, but no longer actively developed.
diff --git a/media-libs/glSDL/files/digest-glSDL-0.3 b/media-libs/glSDL/files/digest-glSDL-0.3
new file mode 100644
index 0000000..21527fa
--- /dev/null
+++ b/media-libs/glSDL/files/digest-glSDL-0.3
@@ -0,0 +1 @@
+MD5 c726a1b3658d58afadf76b93081ec521 glSDL-0.3.tar.gz 127459
diff --git a/media-libs/glSDL/glSDL-0.3.ebuild b/media-libs/glSDL/glSDL-0.3.ebuild
new file mode 100644
index 0000000..0f6eb2f
--- /dev/null
+++ b/media-libs/glSDL/glSDL-0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="A wrapper that implements SDL on top of OpenGL"
+HOMEPAGE="http://olofson.net/mixed.html"
+SRC_URI="http://olofson.net/download/${P}.tar.gz"
+LICENSE=""
+SLOT="1"
+KEYWORDS="x86"
+
+DEPEND=">media-libs/libsdl-1.2.0 virtual/opengl"
+
+#RDEPEND=""
+
+S="${WORKDIR}/${P}"
+
+src_compile() {
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "./configure failed"
+	emake || die
+}
+
+src_install () {
+	# You must *personally verify* that this trick doesn't install
+	# anything outside of DESTDIR; do this by reading and
+	# understanding the install part of the Makefiles.
+	make DESTDIR=${D} install || die
+	# For Makefiles that don't make proper use of DESTDIR, setting
+	# prefix is often an alternative.  However if you do this, then
+	# you also need to specify mandir and infodir, since they were
+	# passed to ./configure as absolute paths (overriding the prefix
+	# setting).
+	#make \
+	#	prefix=${D}/usr \
+	#	mandir=${D}/usr/share/man \
+	#	infodir=${D}/usr/share/info \
+	#	install || die
+	# Again, verify the Makefiles!  We don't want anything falling
+	# outside of ${D}.
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
new file mode 100644
index 0000000..c522165
--- /dev/null
+++ b/media-libs/mesa/Manifest
@@ -0,0 +1,60 @@
+AUX 6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f SHA1 ffdf556a66229d0417d5d7e7833c8e9bfdb39741 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e
+MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421
+RMD160 70713f143d080b444089a95712efd227227c523f files/6.4-dont-install-gles-headers.patch 421
+SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e files/6.4-dont-install-gles-headers.patch 421
+AUX 6.4-multilib-fix.patch 535 RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 SHA1 fe4b95135fd2855c40ab726045e901355a3af4aa SHA256 8fe39ec2ca86b206cb0d870d6644f68eb52af209f5bfb6eaad612deee80d754f
+MD5 d6254b7a775480084efcd30d9fb4cbad files/6.4-multilib-fix.patch 535
+RMD160 5ab0237e5096728b38675c9c265cfb2c88009c00 files/6.4-multilib-fix.patch 535
+SHA256 8fe39ec2ca86b206cb0d870d6644f68eb52af209f5bfb6eaad612deee80d754f files/6.4-multilib-fix.patch 535
+AUX 6.5-glxfix.patch 2338 RMD160 4e4b28a7e59f826a61bb1f57ea6d30fa0a0766b0 SHA1 94b875643d2f2e70174d214542a3c96015a16472 SHA256 38a85d98f545accaa61e708711926c29105731c939ade70e1d7fd52ff8aec76c
+MD5 2980e45b6a6399eee57e08ba8c1fda18 files/6.5-glxfix.patch 2338
+RMD160 4e4b28a7e59f826a61bb1f57ea6d30fa0a0766b0 files/6.5-glxfix.patch 2338
+SHA256 38a85d98f545accaa61e708711926c29105731c939ade70e1d7fd52ff8aec76c files/6.5-glxfix.patch 2338
+AUX 6.5-re-order-context-destruction.patch 2295 RMD160 5c2648f9d4fca2f3abf53ad9d29101fd931493be SHA1 0f3825910ba3d246cf59efe560f9fecab82e86d4 SHA256 dda980be89d14df3659c0d409c56e4ccd6a03afdca2e8edc502845943423a600
+MD5 621322964afb60d36444f1dfe86719b2 files/6.5-re-order-context-destruction.patch 2295
+RMD160 5c2648f9d4fca2f3abf53ad9d29101fd931493be files/6.5-re-order-context-destruction.patch 2295
+SHA256 dda980be89d14df3659c0d409c56e4ccd6a03afdca2e8edc502845943423a600 files/6.5-re-order-context-destruction.patch 2295
+AUX 64bit-fix-have-dix-config.patch 645 RMD160 4a05bcdab2828f9b5ad80df80d63d4767617b756 SHA1 9ad64261cbbbe6c3e897701dad2f4f0e2f67d4c7 SHA256 757a94fe2e76f6ea4d831a3aaf3fac7e344527239a10b014d6900af341e7abab
+MD5 0009bfb15983cd6258cde8ca9ec7134c files/64bit-fix-have-dix-config.patch 645
+RMD160 4a05bcdab2828f9b5ad80df80d63d4767617b756 files/64bit-fix-have-dix-config.patch 645
+SHA256 757a94fe2e76f6ea4d831a3aaf3fac7e344527239a10b014d6900af341e7abab files/64bit-fix-have-dix-config.patch 645
+AUX 64bit-fix-indirect-vertex-array.patch 748 RMD160 b413df73cc43b83931cd25d5e207d3c49078dd55 SHA1 34f65998c23a45f07f4c5a71ab773038ffaeaa40 SHA256 2e070e5e4aa4b1a1f12ccce290496c5eca92d76819805fe8d529a4f7fd71c82c
+MD5 c955d3e7a9971b7a32359a45383569f8 files/64bit-fix-indirect-vertex-array.patch 748
+RMD160 b413df73cc43b83931cd25d5e207d3c49078dd55 files/64bit-fix-indirect-vertex-array.patch 748
+SHA256 2e070e5e4aa4b1a1f12ccce290496c5eca92d76819805fe8d529a4f7fd71c82c files/64bit-fix-indirect-vertex-array.patch 748
+AUX change-default-dri-driver-dir-X7.1.patch 399 RMD160 169dd99888a66bf63bc528f183bd4c2b6d16b0f9 SHA1 c44dd4a468d9f4b2ed202bc914bc25d5db206a80 SHA256 8dbdbad95f47bfc18a366e091ffc1d67ff16da970181626d939a19eed46a212d
+MD5 81ac0734b6194da3d9ca40d564303670 files/change-default-dri-driver-dir-X7.1.patch 399
+RMD160 169dd99888a66bf63bc528f183bd4c2b6d16b0f9 files/change-default-dri-driver-dir-X7.1.patch 399
+SHA256 8dbdbad95f47bfc18a366e091ffc1d67ff16da970181626d939a19eed46a212d files/change-default-dri-driver-dir-X7.1.patch 399
+AUX change-default-dri-driver-dir.patch 412 RMD160 84b1a7e60661603735f377759917c1064346ee3e SHA1 45af3e1c2dc2e25242f6be0bc9149dad294d63da SHA256 50868940210dc613b67b87a900158719e96bb38451cbcfbd12edab4b170065d7
+MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412
+RMD160 84b1a7e60661603735f377759917c1064346ee3e files/change-default-dri-driver-dir.patch 412
+SHA256 50868940210dc613b67b87a900158719e96bb38451cbcfbd12edab4b170065d7 files/change-default-dri-driver-dir.patch 412
+AUX lib/libGL.la 763 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 SHA1 ded967a6f28e90238b601b422abc76b472e8f732 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf
+MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
+RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 files/lib/libGL.la 763
+SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf files/lib/libGL.la 763
+AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5
+MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
+RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 files/lib/libGLU.la 752
+SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/lib/libGLU.la 752
+AUX makedepend-location.patch 375 RMD160 30e1c4a45cdd2077edd80043911bf05275493195 SHA1 0e13e7a5668366b891433ab31f0c7489e4c9ba12 SHA256 3541f6528b402328886e3169169fc400db11ed91d39ddd2b5d3b1f6be77d7ff5
+MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375
+RMD160 30e1c4a45cdd2077edd80043911bf05275493195 files/makedepend-location.patch 375
+SHA256 3541f6528b402328886e3169169fc400db11ed91d39ddd2b5d3b1f6be77d7ff5 files/makedepend-location.patch 375
+AUX radeon-texture-problem.patch 363 RMD160 d7241f061f4f0abbab57920cfaa480ad819bf9cb SHA1 2b8a1d5e6423db4a72fbd92e66e4426346f5e14e SHA256 01d74821fedfd3409d5aa5c7620c2d51e7f1ddad63b6b01d4bd25595afdfbbea
+MD5 5bd06d12cc0c1f11b9671eb7ec57f5f0 files/radeon-texture-problem.patch 363
+RMD160 d7241f061f4f0abbab57920cfaa480ad819bf9cb files/radeon-texture-problem.patch 363
+SHA256 01d74821fedfd3409d5aa5c7620c2d51e7f1ddad63b6b01d4bd25595afdfbbea files/radeon-texture-problem.patch 363
+DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
+EBUILD mesa-6.5-r3.ebuild 8934 RMD160 26ea1f902bab6c5236936e6228d269ecc4ab8e31 SHA1 e0e0b6589e151a4a3800f4b7f4cb8f07ec67817b SHA256 36267b2a89152827ea93ed2c9601a9e0a85d46c456b55650f6dcb4024127bec6
+MD5 da4a5c2f08b5132be4c18e3fcba3b5de mesa-6.5-r3.ebuild 8934
+RMD160 26ea1f902bab6c5236936e6228d269ecc4ab8e31 mesa-6.5-r3.ebuild 8934
+SHA256 36267b2a89152827ea93ed2c9601a9e0a85d46c456b55650f6dcb4024127bec6 mesa-6.5-r3.ebuild 8934
+MISC NOTES 56 RMD160 2118e192b9ad5ed5daf93a49d4c0e46387837252 SHA1 71c6ee3a263577544c3295268adf5c95bd24756c SHA256 3e7136c2e370de3b6304e7cf0ce86be88f69bf43f97393f4d0fc68a5e4f5fc17
+MD5 ac5e65b9645039da031dc63746df3591 NOTES 56
+RMD160 2118e192b9ad5ed5daf93a49d4c0e46387837252 NOTES 56
+SHA256 3e7136c2e370de3b6304e7cf0ce86be88f69bf43f97393f4d0fc68a5e4f5fc17 NOTES 56
+MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r3 241
+RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r3 241
+SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r3 241
diff --git a/media-libs/mesa/NOTES b/media-libs/mesa/NOTES
new file mode 100644
index 0000000..8365ca8
--- /dev/null
+++ b/media-libs/mesa/NOTES
@@ -0,0 +1 @@
+A version that has fixed glx. This way compiz compiles.
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
new file mode 100644
index 0000000..5bdc0a1
--- /dev/null
+++ b/media-libs/mesa/files/6.4-dont-install-gles-headers.patch
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..8e16a95
--- /dev/null
+++ b/media-libs/mesa/files/6.4-multilib-fix.patch
@@ -0,0 +1,27 @@
+--- 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-glxfix.patch b/media-libs/mesa/files/6.5-glxfix.patch
new file mode 100644
index 0000000..4e336e2
--- /dev/null
+++ b/media-libs/mesa/files/6.5-glxfix.patch
@@ -0,0 +1,55 @@
+Index: include/GL/glx.h
+===================================================================
+RCS file: /cvs/mesa/Mesa/include/GL/glx.h,v
+retrieving revision 1.52
+diff -u -r1.52 glx.h
+--- include/GL/glx.h May 2006 22:25:18 -00001.52
++++ include/GL/glx.h May 2006 10:10:07 -0000
+@@ -423,7 +423,44 @@
+ #ifndef GLX_EXT_texture_from_pixmap
+ #define GLX_EXT_texture_from_pixmap 1
+ 
+-/* XXX need enums/tokens! */
++#define GLX_BIND_TO_TEXTURE_RGB_EXT        0x20D0
++#define GLX_BIND_TO_TEXTURE_RGBA_EXT       0x20D1
++#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT     0x20D2
++#define GLX_BIND_TO_TEXTURE_TARGETS_EXT    0x20D3
++#define GLX_Y_INVERTED_EXT                 0x20D4
++
++#define GLX_TEXTURE_FORMAT_EXT             0x20D5
++#define GLX_TEXTURE_TARGET_EXT             0x20D6
++#define GLX_MIPMAP_TEXTURE_EXT             0x20D7
++
++#define GLX_TEXTURE_FORMAT_NONE_EXT        0x20D8
++#define GLX_TEXTURE_FORMAT_RGB_EXT         0x20D9
++#define GLX_TEXTURE_FORMAT_RGBA_EXT        0x20DA
++
++#define GLX_TEXTURE_1D_BIT_EXT             0x00000001
++#define GLX_TEXTURE_2D_BIT_EXT             0x00000002
++#define GLX_TEXTURE_RECTANGLE_BIT_EXT      0x00000004
++
++#define GLX_TEXTURE_1D_EXT                 0x20DB
++#define GLX_TEXTURE_2D_EXT                 0x20DC
++#define GLX_TEXTURE_RECTANGLE_EXT          0x20DD
++
++#define GLX_FRONT_LEFT_EXT                 0x20DE
++#define GLX_FRONT_RIGHT_EXT                0x20DF
++#define GLX_BACK_LEFT_EXT                  0x20E0
++#define GLX_BACK_RIGHT_EXT                 0x20E1
++#define GLX_FRONT_EXT                      GLX_FRONT_LEFT_EXT
++#define GLX_BACK_EXT                       GLX_BACK_LEFT_EXT
++#define GLX_AUX0_EXT                       0x20E2
++#define GLX_AUX1_EXT                       0x20E3 
++#define GLX_AUX2_EXT                       0x20E4 
++#define GLX_AUX3_EXT                       0x20E5 
++#define GLX_AUX4_EXT                       0x20E6 
++#define GLX_AUX5_EXT                       0x20E7 
++#define GLX_AUX6_EXT                       0x20E8
++#define GLX_AUX7_EXT                       0x20E9 
++#define GLX_AUX8_EXT                       0x20EA 
++#define GLX_AUX9_EXT                       0x20EB
+ 
+ extern void glXBindTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list);
+ extern void glXReleaseTexImageEXT(Display *dpy, GLXDrawable drawable, int buffer);
+
+    *
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
new file mode 100644
index 0000000..a882d07
--- /dev/null
+++ b/media-libs/mesa/files/6.5-re-order-context-destruction.patch
@@ -0,0 +1,72 @@
+--- 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/64bit-fix-have-dix-config.patch b/media-libs/mesa/files/64bit-fix-have-dix-config.patch
new file mode 100644
index 0000000..29e6f40
--- /dev/null
+++ b/media-libs/mesa/files/64bit-fix-have-dix-config.patch
@@ -0,0 +1,18 @@
+===================================================================
+RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v
+rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.70
+retrieving revision 1.71
+diff -u -r1.70 -r1.71
+--- Mesa/src/mesa/main/glheader.h	2006/02/11 02:59:38	1.70
++++ Mesa/src/mesa/main/glheader.h	2006/02/15 21:03:34	1.71
+@@ -46,6 +46,9 @@
+ #ifndef GLHEADER_H
+ #define GLHEADER_H
+ 
++#ifdef HAVE_DIX_CONFIG_H
++#include "dix-config.h"
++#endif
+ 
+ #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER)
+ #include "xf86_ansic.h"
diff --git a/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch b/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch
new file mode 100644
index 0000000..4e744e9
--- /dev/null
+++ b/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch
@@ -0,0 +1,17 @@
+===================================================================
+RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v
+rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- Mesa/src/glx/x11/indirect_vertex_array.c	2005/08/19 18:53:26	1.6
++++ Mesa/src/glx/x11/indirect_vertex_array.c	2006/02/14 15:04:45	1.7
+@@ -530,7 +530,7 @@
+ emit_DrawArrays_header_old( __GLXcontext * gc,
+ 			    struct array_state_vector * arrays,
+ 			    size_t * elements_per_request,
+-			    size_t * total_requests,
++			    unsigned int * total_requests,
+ 			    GLenum mode, GLsizei count )
+ {
+     size_t command_size;
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
new file mode 100644
index 0000000..5ea6924
--- /dev/null
+++ b/media-libs/mesa/files/change-default-dri-driver-dir-X7.1.patch
@@ -0,0 +1,11 @@
+--- 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/change-default-dri-driver-dir.patch b/media-libs/mesa/files/change-default-dri-driver-dir.patch
new file mode 100644
index 0000000..36151d6
--- /dev/null
+++ b/media-libs/mesa/files/change-default-dri-driver-dir.patch
@@ -0,0 +1,11 @@
+--- 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/xorg/modules/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
new file mode 100644
index 0000000..79639c7
--- /dev/null
+++ b/media-libs/mesa/files/digest-mesa-6.5-r3
@@ -0,0 +1,3 @@
+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/makedepend-location.patch b/media-libs/mesa/files/makedepend-location.patch
new file mode 100644
index 0000000..7e49dee
--- /dev/null
+++ b/media-libs/mesa/files/makedepend-location.patch
@@ -0,0 +1,12 @@
+diff -urN Mesa-6.3.1.1.orig/configs/linux-dri Mesa-6.3.1.1/configs/linux-dri
+--- Mesa-6.3.1.1.orig/configs/linux-dri	2005-07-23 23:29:14.000000000 -0700
++++ Mesa-6.3.1.1/configs/linux-dri	2005-08-10 14:56:16.000000000 -0700
+@@ -9,7 +9,7 @@
+ CC = gcc
+ CXX = g++
+ 
+-MKDEP = /usr/X11R6/bin/makedepend
++MKDEP = /usr/bin/makedepend
+ #MKDEP = gcc -M
+ #MKDEP_OPTIONS = -MF depend
+ 
diff --git a/media-libs/mesa/files/radeon-texture-problem.patch b/media-libs/mesa/files/radeon-texture-problem.patch
new file mode 100644
index 0000000..c39d7e9
--- /dev/null
+++ b/media-libs/mesa/files/radeon-texture-problem.patch
@@ -0,0 +1,11 @@
+diff -u -r1.11 -r1.12
+--- src/mesa/drivers/dri/r200/r200_texmem.c	2005/02/10 22:36:06	1.11
++++ src/mesa/drivers/dri/r200/r200_texmem.c	2005/08/25 03:38:07	1.12
+@@ -427,7 +427,7 @@
+ 	    fprintf(stderr, "DRM_RADEON_TEXTURE:  again!\n");
+ 	 usleep(1);
+       }
+-   } while ( ret && errno == EAGAIN );
++   } while ( ret == -EAGAIN );
+ 
+    UNLOCK_HARDWARE( rmesa );
diff --git a/media-libs/mesa/mesa-6.5-r3.ebuild b/media-libs/mesa/mesa-6.5-r3.ebuild
new file mode 100644
index 0000000..06d5447
--- /dev/null
+++ b/media-libs/mesa/mesa-6.5-r3.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2006 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.1 2006/04/21 07:15:48 spyderous 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
+	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
+	app-admin/eselect-opengl
+	motif? ( virtual/motif )
+	!<=x11-base/xorg-x11-6.9"
+DEPEND="${RDEPEND}
+	x11-misc/makedepend
+	x11-proto/inputproto
+	x11-proto/xextproto
+	!hppa? ( x11-proto/xf86driproto )
+	x11-proto/xf86vidmodeproto
+	>=x11-proto/glproto-1.4.4
+	motif? ( x11-proto/printproto )"
+
+PROVIDE="virtual/opengl virtual/glu"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+if use debug; then
+	if ! has splitdebug ${FEATURES}; then
+		RESTRICT="${RESTRICT} nostrip"
+	fi
+fi
+
+pkg_setup() {
+	if use debug; then
+		strip-flags
+		append-flags -g
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	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
+	epatch ${FILESDIR}/6.5-glxfix.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 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 ${EXEDESTTREE}"
+	find ${S}/lib* -name '*_dri.so' | xargs doexe
+	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
+	insinto /usr/$(get_libdir)/opengl/xorg-x11/lib
+	doins ${FILESDIR}/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.060401 /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} -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}
+}
+
+add_drivers() {
+	DRI_DRIVERS="${DRI_DRIVERS} $@"
+}