update the repo

12 files changed, 467 insertions, 334 deletions

diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog
deleted file mode 100644
index 12c4a54..0000000
--- a/media-libs/libafterimage/ChangeLog
+++ /dev/null
@@ -1,131 +0,0 @@
-# ChangeLog for media-libs/libafterimage
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.31 2011/03/28 18:07:53 bicatali Exp $
-
-  28 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org>
-  libafterimage-1.20.ebuild, +files/libafterimage-gif.patch:
-  Proper libgif unbundling
-
-*libafterimage-1.20 (28 Feb 2011)
-
-  28 Feb 2011; Sébastien Fabbro <bicatali@gentoo.org>
-  +libafterimage-1.20.ebuild:
-  Version bump
-
-  11 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
-  libafterimage-1.18-r1.ebuild:
-  Use virtual/jpeg wrt #327487.
-
-  14 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org> metadata.xml:
-  Move to afterstep herd
-
-  28 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org>
-  libafterimage-1.18-r1.ebuild:
-  Added xextproto as build dependency (bug #290673). Switched to EAPI=2
-
-  04 Apr 2009; Markus Meier <maekke@gentoo.org>
-  -files/libafterimage-1.15-examples.patch,
-  -files/libafterimage-examples.patch, -libafterimage-1.07.ebuild,
-  -libafterimage-1.15.ebuild, -libafterimage-1.18.ebuild:
-  old
-
-  25 Mar 2009; Raúl Porcel <armin76@gentoo.org>
-  libafterimage-1.18-r1.ebuild:
-  ia64/sparc stable wrt #262418
-
-  21 Mar 2009; Jeroen Roovers <jer@gentoo.org> libafterimage-1.18-r1.ebuild:
-  Stable for HPPA (bug #262418).
-
-  18 Mar 2009; Brent Baude <ranger@gentoo.org> libafterimage-1.18-r1.ebuild:
-  stable ppc, bug 262418
-
-  15 Mar 2009; Tobias Klausmann <klausman@gentoo.org>
-  libafterimage-1.18-r1.ebuild:
-  Stable on alpha, bug #262418
-
-  15 Mar 2009; Brent Baude <ranger@gentoo.org> libafterimage-1.18-r1.ebuild:
-  stable ppc64, bug 262418
-
-  14 Mar 2009; Markus Meier <maekke@gentoo.org>
-  libafterimage-1.18-r1.ebuild:
-  amd64/x86 stable, bug #262418
-
-*libafterimage-1.18-r1 (17 Jan 2009)
-
-  17 Jan 2009; Markus Meier <maekke@gentoo.org>
-  +files/libafterimage-1.18-glx.patch, +libafterimage-1.18-r1.ebuild:
-  fix x11-terms/rxvt-unicode segfault by Martin von Gagern in bug #252651;
-  don't use internal copy of libungif wrt bug #252917
-
-  13 Dec 2008; Alexis Ballier <aballier@gentoo.org>
-  +files/libafterimage-1.18-recmake_bsd.patch, libafterimage-1.18.ebuild:
-  fix build on fbsd and keyword it x86-fbsd, bug #210965
-
-*libafterimage-1.18 (04 Jul 2008)
-
-  04 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
-  +libafterimage-1.18.ebuild:
-  Version bump
-
-  08 Apr 2008; Raúl Porcel <armin76@gentoo.org> libafterimage-1.15.ebuild:
-  ia64/sparc stable wrt #215898
-
-  07 Apr 2008; Tobias Klausmann <klausman@gentoo.org>
-  libafterimage-1.15.ebuild:
-  Stable on alpha, bug #215898
-
-  04 Apr 2008; Brent Baude <ranger@gentoo.org> libafterimage-1.15.ebuild:
-  stable ppc64, bug 215898
-
-  03 Apr 2008; Markus Meier <maekke@gentoo.org> libafterimage-1.15.ebuild:
-  amd64/x86 stable, bug #215898
-
-  03 Apr 2008; Jeroen Roovers <jer@gentoo.org> libafterimage-1.15.ebuild:
-  Stable for HPPA (bug #215898).
-
-  03 Apr 2008; Brent Baude <ranger@gentoo.org> libafterimage-1.15.ebuild:
-  stable ppc, bug 215898
-
-  07 Mar 2008; Raúl Porcel <armin76@gentoo.org> libafterimage-1.15.ebuild:
-  Add ~ia64
-
-  27 Nov 2007; Raúl Porcel <armin76@gentoo.org> libafterimage-1.15.ebuild:
-  Add ~alpha/~sparc wrt #200316
-
-  26 Nov 2007; Markus Rothe <corsair@gentoo.org> libafterimage-1.15.ebuild:
-  Added ~ppc64; bug #200316
-
-  25 Nov 2007; René Nussbaumer <killerfox@gentoo.org>
-  libafterimage-1.15.ebuild:
-  Added to ~hppa.
-
-  25 Nov 2007; René Nussbaumer <killerfox@gentoo.org>
-  libafterimage-1.15.ebuild:
-  Added to ~ppc.
-
-  20 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  libafterimage-1.15.ebuild:
-  Fixed html install directory (bug #199565), thanks Flameeyes.
-
-  05 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  files/libafterimage-makefile.in.patch:
-  Fixed re-install and linking (bug #198087, thanks galtgendo@o2.pl)
-
-*libafterimage-1.15 (04 Nov 2007)
-
-  04 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/libafterimage-1.15-examples.patch,
-  +files/libafterimage-makefile.in.patch, +libafterimage-1.15.ebuild:
-  Version bump.
-
-  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
-  libafterimage-1.07.ebuild:
-  Drop virtual/x11 references.
-
-*libafterimage-1.07 (05 Feb 2007)
-
-  05 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org>
-  +files/libafterimage-config.patch, +files/libafterimage-examples.patch,
-  +metadata.xml, +libafterimage-1.07.ebuild:
-  Initial import. Closing bug #149088.
-
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
deleted file mode 100644
index 27cba7c..0000000
--- a/media-libs/libafterimage/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libafterimage-config.patch 369 RMD160 e209d20413373694cd4b4cf16cc1927fbb8437f6 SHA1 030143afcdece5802511b51899c221d48e421ebf SHA256 75a7683211f8d65a6cb1a6ed99b013d7bcc5b3cb3a241e36748a2c0b5ff960c6
-AUX libafterimage-gif.patch 1436 RMD160 8656affb37559f0cee1fd8143e8c29f78ec4dd42 SHA1 a80433320c5c22c9ffb754a3952aada7df6760a9 SHA256 d9e681e5fae08dd6e648ee699e3feb617a924ec5c011fdab81a75d4c3949ea9a
-AUX libafterimage-makefile.in.patch 2168 RMD160 4b6340f3845774de82fb612de0e94f0841ae869a SHA1 f707ad8a850eafacdac780a727f936b8cf8673de SHA256 44b2f80b7e5f9bef3852d179e247592f3d5a0983de105082d1b5d1667eb4ced8
-DIST libAfterImage-1.20.tar.bz2 1017055 SHA1 c214ac89a1e61d9c8834ccc9210d0f7952305737 SHA256 6e233253f4d1dd22dfce9f9a245cc036d814fc99ba7f6732f4e345de62cfe458
-EBUILD libafterimage-1.20.ebuild 2141 RMD160 c630ba450e45a658f0d97b6eb088c06599d42482 SHA1 d6c0a62a19e9358a3d21915dc4c02d10c1e08b19 SHA256 608c623cea772a39f8e6686662f31e688140ac4d9157f2ab6074344200457165
-MISC ChangeLog 4423 RMD160 de4595ddc0bb8829a5eedf0a93f499fe79443158 SHA1 0130be843f4461f045cacb8cd87c33d9c7e0c92d SHA256 66fc2c11380f77f5fc0f1dc18f403e24a7d0d02a2090fb27921cdb0c71870e6c
-MISC metadata.xml 803 RMD160 5a20a7d1e910ee66f7bb5fd53aad8341a1f0b653 SHA1 bfee50707db93a6a62978caf711b15be6446c67c SHA256 5f1fc597d0da18541c30e568f47ec9d1937f277dc34130101e8e605924a4d444
diff --git a/media-libs/libafterimage/files/libafterimage-config.patch b/media-libs/libafterimage/files/libafterimage-config.patch
deleted file mode 100644
index d2ed9e0..0000000
--- a/media-libs/libafterimage/files/libafterimage-config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- afterimage-config.in	2005-01-12 18:03:36.000000000 +0000
-+++ afterimage-config.in.new	2006-10-15 14:16:12.000000000 +0100
-@@ -110,11 +110,7 @@
-         	libs="-lAfterBase $libs"
-  	fi
-  	libs="-lAfterImage $libs" 
--	if test "@libdir@" != "/usr/lib" ; then
--  		echo -L@libdir@ $libs
-- 	else
--  		echo $libs
-- 	fi
-+        echo $libs
-  else
-         echo $libs
-  fi
diff --git a/media-libs/libafterimage/files/libafterimage-gif.patch b/media-libs/libafterimage/files/libafterimage-gif.patch
deleted file mode 100644
index 8a2ca8e..0000000
--- a/media-libs/libafterimage/files/libafterimage-gif.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.in.orig	2011-03-28 18:55:22.000000000 +0100
-+++ configure.in	2011-03-28 18:56:08.000000000 +0100
-@@ -60,12 +60,9 @@
- dnl# AC_ARG_WITH(xpm_includes,   [  --with-xpm-includes=DIR  use libXpm includes in DIR( when builtin XPM handling is disabled )], xpm_includes="$withval", xpm_includes=no)
- 
- dnl# standard libgif/ungif should not be used and considered obsolete!
--dnl# AC_ARG_WITH(ungif,		    [  --with-ungif             support Uncompressed GIF image format using libungif [no]],with_ungif="$withval",with_ungif=no)
--dnl# AC_ARG_WITH(gif,		    [  --with-gif               support GIF image format using libgif   [no]],with_gif="$withval",with_gif=no)
--dnl# AC_ARG_WITH(gif_includes,   [  --with-gif-includes=DIR  use GIF includes in DIR], gif_includes="$withval", gif_includes=no)
--with_ungif=no
--with_gif=no
--with_gif_includes=no
-+AC_ARG_WITH(ungif,		    [  --with-ungif             support Uncompressed GIF image format using libungif [no]],with_ungif="$withval",with_ungif=no)
-+AC_ARG_WITH(gif,		    [  --with-gif               support GIF image format using libgif   [no]],with_gif="$withval",with_gif=no)
-+AC_ARG_WITH(gif_includes,   [  --with-gif-includes=DIR  use GIF includes in DIR], gif_includes="$withval", gif_includes=no)
- AC_ARG_WITH(builtin_gif,    [  --with-builtin-gif               support Uncompressed GIF image format using builtin libgif [yes]],with_builtin_gif="$withval",with_builtin_gif=yes)
- 
- 
diff --git a/media-libs/libafterimage/files/libafterimage-makefile.in.patch b/media-libs/libafterimage/files/libafterimage-makefile.in.patch
deleted file mode 100644
index a41f90a..0000000
--- a/media-libs/libafterimage/files/libafterimage-makefile.in.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.in.orig	2005-08-16 10:00:02.000000000 +0200
-+++ Makefile.in	2005-08-16 10:00:35.000000000 +0200
-@@ -79,7 +79,7 @@
- MV		= @MV@
- RM		= @RM@
- RMF		= @RM@ -f
--MKDIR		= @MKDIR@
-+MKDIR		= @MKDIR@ -p
- FIND		= @FIND@
- XARGS		= @XARGS@
- LDCONFIG	= @LDCONFIG@
-@@ -135,20 +135,6 @@
- 		@(if [ -d $(LIBDIR) ] && [ -w $(LIBDIR) ]; then \
- 		    echo "$(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR)"; \
- 		    $(INSTALL_LIB) $(LIB_STATIC) $(LIBDIR); \
--		    if [ `uname` = "Linux" ]; then \
--			if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
--		    	    echo "" > /dev/null; \
--			elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \
--		    	    echo "" > /dev/null; \
--			else \
--		    	    echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \
--		    	    echo "$(LIB_STATIC), you may need to add it or set LD_LIBRARY_PATH."; \
--			fi; \
--			if test -w /etc; then \
--			    echo "$(LDCONFIG)"; \
--			    $(LDCONFIG); \
--			fi; \
--		    fi ;\
- 		fi \
- 		)
- 
-@@ -161,18 +147,6 @@
- 		$(RM) -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
- 		$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \
- 		$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
--		if test `uname` = "Linux"; then \
--		   if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
--		     echo "" > /dev/null; \
--		   elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \
--		     echo "" > /dev/null; \
--		   else \
--		     echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \
--		     echo "$(LIB_SHARED), you may need to add it or set LD_LIBRARY_PATH."; \
--		   fi; \
--		   echo "$(LDCONFIG)"; \
--		   $(LDCONFIG); \
--		 fi \
- 		)
- 
- install.cyg:
-@@ -393,8 +366,8 @@
- 	$(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIB_SHARED).$(LIBVERMAJOR)
- 
- $(LIB_SHARED).$(LIBVER): $(LIB_OBJS) $(LIB_INCS) config.h
--	$(CC) -shared -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
--	 $(LIB_OBJS)
-+	$(CC) -shared $(USER_LD_FLAGS) -Wl,-soname,$(LIB_SHARED).$(LIBVERMAJOR) -o $(LIB_SHARED).$(LIBVER) \
-+	 $(LIB_OBJS) $(LIBRARIES)
- 
- install.man:
- 		@if [ -d doc/man ] ; then \
diff --git a/media-libs/libafterimage/libafterimage-1.20.ebuild b/media-libs/libafterimage/libafterimage-1.20.ebuild
deleted file mode 100644
index 97f91a9..0000000
--- a/media-libs/libafterimage/libafterimage-1.20.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.2 2011/03/28 18:07:53 bicatali Exp $
-
-EAPI=3
-inherit eutils autotools
-
-MY_PN=libAfterImage
-
-DESCRIPTION="Afterstep's standalone generic image manipulation library"
-HOMEPAGE="http://www.afterstep.org/afterimage/index.php"
-SRC_URI="ftp://ftp.afterstep.org/stable/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64-linux ~x86-linux"
-IUSE="gif jpeg mmx nls png svg tiff examples static-libs truetype"
-
-RDEPEND="x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXrender
-	png?  ( >=media-libs/libpng-1.4 )
-	jpeg? ( virtual/jpeg )
-	gif?  ( media-libs/giflib )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xextproto
-	!x11-wm/afterstep"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# fix some ldconfig problem in makefile.in
-	epatch "${FILESDIR}"/${PN}-makefile.in.patch
-	# fix lib paths in afterimage-config
-	epatch "${FILESDIR}"/${PN}-config.patch
-	# fix gif unbundle
-	epatch "${FILESDIR}"/${PN}-gif.patch
-	# remove forced flags
-	sed -i \
-		-e 's/CFLAGS="-O3"//' \
-		-e 's/ -rdynamic//' \
-		configure.in || die "sed failed"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs staticlibs) \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with svg) \
-		$(use_with tiff) \
-		$(use_with truetype ttf) \
-		--enable-glx \
-		--enable-sharedlibs \
-		--with-x \
-		--with-xpm \
-		--without-builtin-gif \
-		--without-builtin-jpeg \
-		--without-builtin-png \
-		--without-builtin-zlib \
-		--without-afterbase
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		AFTER_DOC_DIR="${D}/usr/share/doc/${PF}" \
-		install || die "emake install failed"
-	dodoc ChangeLog README || die
-	if use examples; then
-		cd apps || die
-		emake clean
-		rm -f Makefile*
-		insinto /usr/share/doc/${PF}/examples
-		doins * || die "install examples failed"
-	fi
-}
diff --git a/media-libs/libafterimage/metadata.xml b/media-libs/libafterimage/metadata.xml
deleted file mode 100644
index fb1417e..0000000
--- a/media-libs/libafterimage/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>afterstep</herd>
-<longdescription>
-libAfterImage is a generic image manipulation library.
-It was initially implemented to address AfterStep Window Manager's needs for
-image handling, but it evolved into software suitable for project
-that has needs for handling images. Most of the popular image formats are
-supported using standard libraries, with XCF, XPM, PPM/PNM, BMP, ICO,
-TGA and GIF being supported internally. PNG, JPEG and TIFF formats are
-supported via standard libraries. Text rendering capabilities
-included, providing support for TrueType fonts using FreeType library,
-and anti-aliasing of standard fonts from X window system.
-</longdescription>
-</pkgmetadata>
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
new file mode 100644
index 0000000..0b1a7fd
--- /dev/null
+++ b/media-libs/mesa/Manifest
@@ -0,0 +1,5 @@
+AUX eselect-mesa.conf.7.11 1670 RMD160 74d85b0481f36a8e2b2e09245d49d09671500946 SHA1 5c5f468feaae946e5901698d1c0ffe8fc480b783 SHA256 448d08e97e931563aa2e33f22feeaf911caf9a2eb9fd7b446485311d1dcc1225
+AUX glx_ro_text_segm.patch 731 RMD160 6d2bd85591d6349fa45a5ee16c724859c640e902 SHA1 3015aa2bd139bcdf2c3fae61f460f0c5aaeb1df7 SHA256 e36af5b530fdbe2b0e62a035bf4bf4baef267c3dc56133d1a58e56899ebffc5c
+AUX mesa-glibc-2.3.5-initstate_r.patch 851 RMD160 7719973b9e528aad9be5db555d083a5c50af58dc SHA1 6df8b389f1a70b14f4a4582be6582e07d2799c25 SHA256 b5598436ea525e339d837f740300c35f232967384cad8bb81e7a2ec4990ee734
+DIST MesaLib-7.11.1.tar.bz2 6255382 RMD160 4d63a0485eaa26d61f08249b209245eed16b11bb SHA1 226ce14d3adf8fe5a6d98f785bb5f63d2a8656da SHA256 229a8b38502147fbbb99665ed9b892d194ebcb5f5875a1701a54acea94a9c8c9
+EBUILD mesa-7.11.1.ebuild 10057 RMD160 28bdb30ef5d7468a08af1e5edb9e86f61400972d SHA1 c61fed5bf32845a690f22a5599f22dc266ddeba6 SHA256 8591c63ed4ed9b43c459b73b88a21d7a8ac42f8bc1c93067d38cc88f39d1456d
diff --git a/media-libs/mesa/files/eselect-mesa.conf.7.11 b/media-libs/mesa/files/eselect-mesa.conf.7.11
new file mode 100644
index 0000000..3a1b196
--- /dev/null
+++ b/media-libs/mesa/files/eselect-mesa.conf.7.11
@@ -0,0 +1,39 @@
+# mesa classic/gallium implementations in this release
+
+# Syntax description:
+# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
+#   classic/gallium implementations.
+# * MESA_DRIVERS is an associative array, for each member "foo" of
+#   MESA_IMPLEMENTATIONS it contains the following elements:
+#   foo,description - Human-readable description of the driver
+#   foo,classicdriver - Filename of the classic driver
+#   foo,galliumdriver - Filename of the gallium driver
+#   foo,default - which of classic or gallium is chosen by default
+
+MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw"
+declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not associative."
+
+MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)"
+MESA_DRIVERS[i915,classicdriver]="i915_dri.so"
+MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so"
+MESA_DRIVERS[i915,default]="classic"
+
+MESA_DRIVERS[i965,description]="i965 (Intel 965, G/Q3x, G/Q4x)"
+MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
+MESA_DRIVERS[i965,galliumdriver]="i965g_dri.so"
+MESA_DRIVERS[i965,default]="classic"
+
+MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
+MESA_DRIVERS[r300,classicdriver]="r300_dri.so"
+MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so"
+MESA_DRIVERS[r300,default]="gallium"
+
+MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern Islands)"
+MESA_DRIVERS[r600,classicdriver]="r600_dri.so"
+MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so"
+MESA_DRIVERS[r600,default]="gallium"
+
+MESA_DRIVERS[sw,description]="sw (Software renderer)"
+MESA_DRIVERS[sw,classicdriver]="swrast_dri.so"
+MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so"
+MESA_DRIVERS[sw,default]="gallium"
diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch
new file mode 100644
index 0000000..495b7dc
--- /dev/null
+++ b/media-libs/mesa/files/glx_ro_text_segm.patch
@@ -0,0 +1,28 @@
+2011-02-09	Jeremy Huddleston <jeremyhu@freedesktop.org
+
+	#240956
+	* configure.ac	add support to enable readonly test segment on x86
+
+--- configure.ac.orig	2008-11-17 23:19:38.000000000 +0100
++++ configure.ac	2008-11-17 23:20:17.000000000 +0100
+@@ -499,6 +499,20 @@
+     enable_xcb=no
+ fi
+ 
++
++dnl readonly text segment on x86 hardened platforms
++AC_ARG_ENABLE([glx_rts],
++    [AS_HELP_STRING([--enable-glx-rts],
++        [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
++    [enable_glx_rts="$enableval"],
++    [enable_glx_rts=no])
++if test "x$enable_glx_rts" = xyes; then
++    DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
++else
++    enable_glx_rts=no
++fi
++
++
+ dnl
+ dnl libGL configuration per driver
+ dnl
diff --git a/media-libs/mesa/files/mesa-glibc-2.3.5-initstate_r.patch b/media-libs/mesa/files/mesa-glibc-2.3.5-initstate_r.patch
new file mode 100644
index 0000000..1252965
--- /dev/null
+++ b/media-libs/mesa/files/mesa-glibc-2.3.5-initstate_r.patch
@@ -0,0 +1,25 @@
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=323811
+--- src/glx/glxhash.c.old	2011-11-29 23:51:43.000000000 +0900
++++ src/glx/glxhash.c	2011-11-29 23:52:23.000000000 +0900
+@@ -88,21 +88,10 @@
+ 
+ #define HASH_ALLOC malloc
+ #define HASH_FREE  free
+-#ifndef __GLIBC__
+ #define HASH_RANDOM_DECL	char *ps, rs[256]
+ #define HASH_RANDOM_INIT(seed)	ps = initstate(seed, rs, sizeof(rs))
+ #define HASH_RANDOM		random()
+ #define HASH_RANDOM_DESTROY	setstate(ps)
+-#else
+-#define HASH_RANDOM_DECL	struct random_data rd; int32_t rv; char rs[256]
+-#define HASH_RANDOM_INIT(seed)					\
+-   do {								\
+-      (void) memset(&rd, 0, sizeof(rd));			\
+-      (void) initstate_r(seed, rs, sizeof(rs), &rd);		\
+-   } while(0)
+-#define HASH_RANDOM             ((void) random_r(&rd, &rv), rv)
+-#define HASH_RANDOM_DESTROY
+-#endif
+ 
+ typedef struct __glxHashBucket
+ {
diff --git a/media-libs/mesa/mesa-7.11.1.ebuild b/media-libs/mesa/mesa-7.11.1.ebuild
new file mode 100644
index 0000000..7446587
--- /dev/null
+++ b/media-libs/mesa/mesa-7.11.1.ebuild
@@ -0,0 +1,370 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.1.ebuild,v 1.1 2011/11/18 16:16:49 chithanh Exp $
+
+EAPI=3
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-2"
+	EXPERIMENTAL="true"
+fi
+
+inherit base autotools multilib flag-o-matic python toolchain-funcs ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
+		${SRC_PATCHES}"
+fi
+
+LICENSE="MIT LGPL-3 SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+INTEL_CARDS="intel"
+RADEON_CARDS="radeon"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} mach64 mga nouveau r128 savage sis vmware tdfx via"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic debug +egl +gallium gbm gles +llvm motif +nptl openvg osmesa pic pax_kernel selinux shared-dricore +shared-glapi kernel_FreeBSD"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
+# not a runtime dependency of this package, but dependency of packages which
+# depend on this package, bug #342393
+EXTERNAL_DEPEND="
+	>=x11-proto/dri2proto-2.2
+	>=x11-proto/glproto-1.4.11
+"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="${EXTERNAL_DEPEND}
+	!<x11-base/xorg-server-1.7
+	!<=x11-proto/xf86driproto-2.0.3
+	classic? ( app-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
+	app-admin/eselect-opengl
+	dev-libs/expat
+	gbm? ( sys-fs/udev )
+	x11-libs/libICE
+	>=x11-libs/libX11-1.3.99.901
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXxf86vm
+	motif? ( x11-libs/openmotif )
+	gallium? (
+		llvm? ( >=sys-devel/llvm-2.8 )
+	)
+	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+"
+for card in ${INTEL_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	"
+done
+
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*
+	dev-libs/libxml2[python]
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
+	x11-misc/makedepend
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.0.99.1
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# It is slow without texrels, if someone wants slow
+# mesa without texrels +pic use is worth the shot
+QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+
+# Think about: ggi, fbcon, no-X configs
+
+pkg_setup() {
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
+	# recommended by upstream
+	append-flags -ffast-math
+	# workaround toc-issue wrt #386545
+	use ppc64 && append-flags -mminimal-toc
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-2_src_unpack
+}
+
+src_prepare() {
+	# apply patches
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+	[[ -n ${GLIBC2dot3} ]] && epatch "${FILESDIR}"/mesa-glibc-2.3.5-initstate_r.patch
+
+	# FreeBSD 6.* doesn't have posix_memalign().
+	if [[ ${CHOST} == *-freebsd6.* ]]; then
+		sed -i \
+			-e "s/-DHAVE_POSIX_MEMALIGN//" \
+			configure.ac || die
+	fi
+	# Solaris needs some recent POSIX stuff in our case
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
+		sed -i -e 's/uint/unsigned int/g' src/egl/drivers/glx/egl_glx.c || die
+	fi
+
+	# In order for mesa to complete it's build process we need to use a tool
+	# that it compiles. When we cross compile this clearly does not work
+	# so we require mesa to be built on the host system first. -solar
+	if tc-is-cross-compiler; then
+		sed -i -e "s#^GLSL_CL = .*\$#GLSL_CL = glsl_compiler#g" \
+			"${S}"/src/mesa/shader/slang/library/Makefile || die
+	fi
+
+	base_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use classic; then
+	# Configurable DRI drivers
+		driver_enable swrast
+		driver_enable video_cards_intel i810 i915 i965
+		driver_enable video_cards_nouveau nouveau
+		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 r600
+		driver_enable video_cards_savage savage
+		driver_enable video_cards_sis sis
+		driver_enable video_cards_tdfx tdfx
+		driver_enable video_cards_via unichrome
+	fi
+
+	myconf+="
+		$(use_enable !bindist texture-float)
+		$(use_enable gles gles1)
+		$(use_enable gles gles2)
+		$(use_enable egl)
+	"
+	if use egl; then
+		use shared-glapi || die "egl needs shared-glapi. Please either enable shared-glapi or disable the egl use flag ."
+		myconf+="
+			--with-egl-platforms=x11$(use gbm && echo ",drm")
+			$(use_enable gallium gallium-egl)
+		"
+	fi
+
+	if use !gallium && use !classic; then
+		ewarn "You enabled neither classic nor gallium USE flags. No hardware"
+		ewarn "drivers will be built."
+	fi
+	if use gallium; then
+		myconf+="
+			--with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")
+			$(use_enable llvm gallium-llvm)
+			$(use_enable openvg)
+		"
+		gallium_enable swrast
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_intel i915 i965
+		gallium_enable video_cards_radeon r300 r600
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if use pax_kernel; then
+		myconf+="
+			$(use_enable x86 glx-rts)
+		"
+	fi
+
+	# --with-driver=dri|xlib|osmesa || do we need osmesa?
+	econf \
+		--disable-option-checking \
+		--with-driver=dri \
+		--disable-glut \
+		--without-demos \
+		--enable-xcb \
+		$(use_enable debug) \
+		$(use_enable gbm) \
+		$(use_enable motif glw) \
+		$(use_enable motif) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable osmesa) \
+		$(use_enable !pic asm) \
+		$(use_enable shared-dricore) \
+		$(use_enable shared-glapi) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		${myconf}
+}
+
+src_install() {
+	base_src_install
+
+	# Save the glsl-compiler for later use
+	if ! tc-is-cross-compiler; then
+		dobin "${S}"/src/glsl/glsl_compiler || die
+	fi
+	# Remove redundant headers
+	# GLUT thing
+	rm -f "${ED}"/usr/include/GL/glut*.h || die "Removing glut include failed."
+	# Glew includes
+	rm -f "${ED}"/usr/include/GL/{glew,glxew,wglew}.h \
+		|| die "Removing glew includes failed."
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.7.11" eselect-mesa.conf || die
+
+	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+	# because user can eselect desired GL provider.
+	ebegin "Moving libGL and friends for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
+		local x
+		for x in "${ED}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+					|| die "Failed to move ${x}"
+			fi
+		done
+	eend $?
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+					insinto "/usr/$(get_libdir)/dri/"
+					if [ -f "${S}/$(get_libdir)/${x}" ]; then
+						insopts -m0755
+						doins "${S}/$(get_libdir)/${x}" || die "failed to install ${x}"
+					fi
+				fi
+			done
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled."
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}