mesa: remove 6.5.1 rc's

5 files changed, 0 insertions, 736 deletions

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 084851e..fe7452e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -30,26 +30,10 @@ AUX r300Fallback-always-return-false.patch 756 RMD160 c8994d5c46badb26fcce945739
 MD5 98634596bb3b55d66e6e60fdbc7590f9 files/r300Fallback-always-return-false.patch 756
 RMD160 c8994d5c46badb26fcce945739bda65405825238 files/r300Fallback-always-return-false.patch 756
 SHA256 fe43a9eb36c3afe095b09be5f066f2b89aca186251fa6350604fb7d53b644c11 files/r300Fallback-always-return-false.patch 756
-DIST MesaLib-6.5.1-rc1.tar.bz2 3137445 RMD160 cec590678d555967f7c7d282ac29765bff1e4779 SHA1 fe0867a1df3dc776c83da96a2aec3a2cadb5cbbc SHA256 7f197d338f4733b1a2e222be2ee4e5185a2376fc535615d21c1948a5e59c8c0f
-DIST MesaLib-6.5.1-rc2.tar.bz2 3130182 RMD160 b0a71d28137be805a88e15b7e8a992a061521627 SHA1 19a39d8b25c32a4f9fce90fdcb9bd775fbada928 SHA256 0a163713f2f0ac1048c2698a41eb7cfccbfb77171480ca78355ad10c884f4252
-EBUILD mesa-6.5.1_rc1.ebuild 9504 RMD160 76edd0dcd176360d2d160278f2826b2fabea3a63 SHA1 9a9385a870a29e463a253518655964632bc4ed29 SHA256 efa6b3a1ce8e38c40806020b768eebc7b76a72e26b6295bb15cdb1f6143b5645
-MD5 6eb3941257d0f7990003271198fd4350 mesa-6.5.1_rc1.ebuild 9504
-RMD160 76edd0dcd176360d2d160278f2826b2fabea3a63 mesa-6.5.1_rc1.ebuild 9504
-SHA256 efa6b3a1ce8e38c40806020b768eebc7b76a72e26b6295bb15cdb1f6143b5645 mesa-6.5.1_rc1.ebuild 9504
-EBUILD mesa-6.5.1_rc2.ebuild 9460 RMD160 99f7a7d4b93c40d59e48455cab0fefe93d0b6bfb SHA1 f5a679725fd9bfb2f46eab22e32c9559d6261f55 SHA256 1372b839e11afd46bea81257b3b056a5cd6599cd0ae3c3d03ddc134b8d234ec5
-MD5 ec5ce8daa1c787aed17b5298ffbaaa16 mesa-6.5.1_rc2.ebuild 9460
-RMD160 99f7a7d4b93c40d59e48455cab0fefe93d0b6bfb mesa-6.5.1_rc2.ebuild 9460
-SHA256 1372b839e11afd46bea81257b3b056a5cd6599cd0ae3c3d03ddc134b8d234ec5 mesa-6.5.1_rc2.ebuild 9460
 EBUILD mesa-9999.ebuild 9943 RMD160 1fed4c2f195679d1b30ef9cc0b7641f08b6025e1 SHA1 637d82b241e4b8846eb590c58610c725dcc25285 SHA256 16ee7466fcf166b9d4b895b234058dba06b378760532c0a19576749f4e471e90
 MD5 fb8b14297c84ff155ba2984cea57ebdd mesa-9999.ebuild 9943
 RMD160 1fed4c2f195679d1b30ef9cc0b7641f08b6025e1 mesa-9999.ebuild 9943
 SHA256 16ee7466fcf166b9d4b895b234058dba06b378760532c0a19576749f4e471e90 mesa-9999.ebuild 9943
-MD5 d662655a6eeabe93fd499842d69720e2 files/digest-mesa-6.5.1_rc1 259
-RMD160 d9cbf24d3f93999b590b575df17700eac5644574 files/digest-mesa-6.5.1_rc1 259
-SHA256 78fd0e28882c86a9af3d8d30a782fe41c68a892211674e7056b00783195f1f0b files/digest-mesa-6.5.1_rc1 259
-MD5 775c2e43e8e7b1601231f2433bdf70af files/digest-mesa-6.5.1_rc2 259
-RMD160 0ab8107541c6c523234184e9bed54132b5c61799 files/digest-mesa-6.5.1_rc2 259
-SHA256 2fbd5df5a385b2590c19199e62d74e4a686b4585559c57aaca95229532bbb7ef files/digest-mesa-6.5.1_rc2 259
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-mesa-9999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-mesa-9999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-mesa-9999 1
diff --git a/media-libs/mesa/files/digest-mesa-6.5.1_rc1 b/media-libs/mesa/files/digest-mesa-6.5.1_rc1
deleted file mode 100644
index 8473daa..0000000
--- a/media-libs/mesa/files/digest-mesa-6.5.1_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aa96e9d7e59e63b25b623b7307bc1262 MesaLib-6.5.1-rc1.tar.bz2 3137445
-RMD160 cec590678d555967f7c7d282ac29765bff1e4779 MesaLib-6.5.1-rc1.tar.bz2 3137445
-SHA256 7f197d338f4733b1a2e222be2ee4e5185a2376fc535615d21c1948a5e59c8c0f MesaLib-6.5.1-rc1.tar.bz2 3137445
diff --git a/media-libs/mesa/files/digest-mesa-6.5.1_rc2 b/media-libs/mesa/files/digest-mesa-6.5.1_rc2
deleted file mode 100644
index 01d6a6e..0000000
--- a/media-libs/mesa/files/digest-mesa-6.5.1_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cbe299b9f638b7907c15c61b5626687c MesaLib-6.5.1-rc2.tar.bz2 3130182
-RMD160 b0a71d28137be805a88e15b7e8a992a061521627 MesaLib-6.5.1-rc2.tar.bz2 3130182
-SHA256 0a163713f2f0ac1048c2698a41eb7cfccbfb77171480ca78355ad10c884f4252 MesaLib-6.5.1-rc2.tar.bz2 3130182
diff --git a/media-libs/mesa/mesa-6.5.1_rc1.ebuild b/media-libs/mesa/mesa-6.5.1_rc1.ebuild
deleted file mode 100644
index 4c8b0a8..0000000
--- a/media-libs/mesa/mesa-6.5.1_rc1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# 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.4.1-r1.ebuild,v 1.3 2005/12/26 13:49:10 stefaan 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="http://mesa3d.sourceforge.net/beta/${MY_SRC_P}.tar.bz2"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_none
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS}
-	debug
-	doc
-	hardened
-	motif
-	nptl
-	xcb"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-libs/libdrm-2.0.1
-	x11-libs/libICE
-	app-admin/eselect-opengl
-	motif? ( virtual/motif )
-	doc? ( app-doc/opengl-manpages )
-	!<=x11-base/xorg-x11-6.9"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-proto/inputproto
-	x11-proto/xextproto
-	!hppa? ( x11-proto/xf86driproto )
-	x11-proto/xf86vidmodeproto
-	>=x11-proto/glproto-1.4.4
-	motif? ( x11-proto/printproto )
-	xcb? ( x11-libs/libxcb )"
-
-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-multilib-fix.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 "DRI_DRIVER_SEARCH_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
-
-	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 xcb-glx`" >> ${HOSTCONF}
-		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
-	fi
-
-	# Configurable DRI drivers
-	if use video_cards_i810; then
-		add_drivers i810 i915
-	fi
-	if use video_cards_mach64; then
-		add_drivers mach64
-	fi
-	if use video_cards_mga; then
-		add_drivers mga
-	fi
-	if use video_cards_r128; then
-		add_drivers r128
-	fi
-	if use video_cards_radeon; then
-		add_drivers radeon r200 r300
-	fi
-	if use video_cards_s3virge; then
-		add_drivers s3v
-	fi
-	if use video_cards_savage; then
-		add_drivers savage
-	fi
-	if use video_cards_sis; then
-		add_drivers sis
-	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
-	if use video_cards_tdfx; then
-		add_drivers tdfx
-	fi
-	if use video_cards_trident; then
-		add_drivers trident
-	fi
-	if use video_cards_via; then
-		add_drivers unichrome
-	fi
-
-	# Defaults based on X.Org 6.9, with some changes
-	if [[ ! -n "${VIDEO_CARDS}" ]]; then
-		if use alpha; then
-			add_drivers mga tdfx r128 r200 r300 radeon
-		elif use amd64; then
-			add_drivers i915 mga r128 r200 r300 radeon tdfx
-		elif use arm; then
-			add_drivers mga r128 r200 r300 radeon
-		elif use hppa; then
-			# no accelerated 3D on hppa
-			true
-		elif use ia64; then
-			add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome
-		elif use mips; then
-			# no accelerated 3D on mips
-			true
-		elif use ppc; then
-			add_drivers mach64 mga r128 r200 r300 radeon tdfx
-		elif use ppc64; then
-			add_drivers mga r128 r200 r300 radeon
-		elif use sparc; then
-			add_drivers ffb mach64
-		elif use x86; then
-			add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \
-				sis tdfx trident unichrome
-		fi
-	fi
-
-	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
-
-	if use hardened; then
-		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
-	fi
-
-	if use sparc; then
-		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-	fi
-
-	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
-
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
-	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
-
-	# Removed glut, since we have separate freeglut/glut ebuilds
-	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
-
-	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
-
-	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
-
-	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
-	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
-
-	# Documented in configs/default
-	if use motif; then
-		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
-		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make \
-		INSTALL_DIR=${D}/usr \
-		DRI_DRIVER_INSTALL_DIR=${D}/usr/$(get_libdir)/dri \
-		INCLUDE_DIR=${D}/usr/include \
-		install || die "Installation failed"
-
-	# Fix Mesa's piss-poor installing
-	if [[ $(get_libdir) != lib ]]; then
-		cd "${D}"/usr
-		rsync \
-			--archive \
-			--update \
-			--links \
-			--hard-links \
-			--ignore-existing \
-			--stats \
-			--progress \
-			--verbose \
-			lib/ $(get_libdir)/ \
-			|| die "Syncing lib/ to $(get_libdir)/ failed"
-		rm -rf lib || die "Removing lib/ failed"
-	fi
-
-	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.060501 /usr/$(get_libdir)/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
-
-	# libGLU doesn't get the plain .so symlink either
-	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
-
-	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
-	# as the default libGL.so.1
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL\.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# FreeBSD doesn't use major.minor versioning, so the library is only
-		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
-		# libGL.so symlink and leave libGL.so.1 being the real thing
-		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
-	else
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -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} $@"
-}
diff --git a/media-libs/mesa/mesa-6.5.1_rc2.ebuild b/media-libs/mesa/mesa-6.5.1_rc2.ebuild
deleted file mode 100644
index 5fdffc4..0000000
--- a/media-libs/mesa/mesa-6.5.1_rc2.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# 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.4.1-r1.ebuild,v 1.3 2005/12/26 13:49:10 stefaan 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="http://mesa3d.sourceforge.net/beta/${MY_SRC_P}.tar.bz2"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="
-	video_cards_i810
-	video_cards_mach64
-	video_cards_mga
-	video_cards_none
-	video_cards_r128
-	video_cards_radeon
-	video_cards_s3virge
-	video_cards_savage
-	video_cards_sis
-	video_cards_sunffb
-	video_cards_tdfx
-	video_cards_trident
-	video_cards_via"
-IUSE="${IUSE_VIDEO_CARDS}
-	debug
-	doc
-	hardened
-	motif
-	nptl
-	xcb"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-libs/libdrm-2.0.1
-	x11-libs/libICE
-	app-admin/eselect-opengl
-	motif? ( virtual/motif )
-	doc? ( app-doc/opengl-manpages )
-	!<=x11-base/xorg-x11-6.9"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-proto/inputproto
-	x11-proto/xextproto
-	!hppa? ( x11-proto/xf86driproto )
-	x11-proto/xf86vidmodeproto
-	>=x11-proto/glproto-1.4.4
-	motif? ( x11-proto/printproto )
-	xcb? ( x11-libs/libxcb )"
-
-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}
-
-	# 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 "DRI_DRIVER_SEARCH_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
-
-	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 xcb-glx`" >> ${HOSTCONF}
-		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
-	fi
-
-	# Configurable DRI drivers
-	if use video_cards_i810; then
-		add_drivers i810 i915
-	fi
-	if use video_cards_mach64; then
-		add_drivers mach64
-	fi
-	if use video_cards_mga; then
-		add_drivers mga
-	fi
-	if use video_cards_r128; then
-		add_drivers r128
-	fi
-	if use video_cards_radeon; then
-		add_drivers radeon r200 r300
-	fi
-	if use video_cards_s3virge; then
-		add_drivers s3v
-	fi
-	if use video_cards_savage; then
-		add_drivers savage
-	fi
-	if use video_cards_sis; then
-		add_drivers sis
-	fi
-	if use video_cards_sunffb; then
-		add_drivers ffb
-	fi
-	if use video_cards_tdfx; then
-		add_drivers tdfx
-	fi
-	if use video_cards_trident; then
-		add_drivers trident
-	fi
-	if use video_cards_via; then
-		add_drivers unichrome
-	fi
-
-	# Defaults based on X.Org 6.9, with some changes
-	if [[ ! -n "${VIDEO_CARDS}" ]]; then
-		if use alpha; then
-			add_drivers mga tdfx r128 r200 r300 radeon
-		elif use amd64; then
-			add_drivers i915 mga r128 r200 r300 radeon tdfx
-		elif use arm; then
-			add_drivers mga r128 r200 r300 radeon
-		elif use hppa; then
-			# no accelerated 3D on hppa
-			true
-		elif use ia64; then
-			add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome
-		elif use mips; then
-			# no accelerated 3D on mips
-			true
-		elif use ppc; then
-			add_drivers mach64 mga r128 r200 r300 radeon tdfx
-		elif use ppc64; then
-			add_drivers mga r128 r200 r300 radeon
-		elif use sparc; then
-			add_drivers ffb mach64
-		elif use x86; then
-			add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \
-				sis tdfx trident unichrome
-		fi
-	fi
-
-	# Set drivers to everything on which we ran add_drivers()
-	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
-
-	if use hardened; then
-		einfo "Deactivating assembly code for hardened build"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-		echo "ASM_API =" >> ${HOSTCONF}
-	fi
-
-	if use sparc; then
-		einfo "Sparc assembly code is not working; deactivating"
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-	fi
-
-	# Replace hardcoded /usr/X11R6 with this
-	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
-
-	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
-	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
-
-	# Removed glut, since we have separate freeglut/glut ebuilds
-	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
-
-	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
-
-	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
-
-	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
-	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
-
-	# Documented in configs/default
-	if use motif; then
-		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
-		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make \
-		INSTALL_DIR=${D}/usr \
-		DRI_DRIVER_INSTALL_DIR=${D}/usr/$(get_libdir)/dri \
-		INCLUDE_DIR=${D}/usr/include \
-		install || die "Installation failed"
-
-	# Fix Mesa's piss-poor installing
-	if [[ $(get_libdir) != lib ]]; then
-		cd "${D}"/usr
-		rsync \
-			--archive \
-			--update \
-			--links \
-			--hard-links \
-			--ignore-existing \
-			--stats \
-			--progress \
-			--verbose \
-			lib/ $(get_libdir)/ \
-			|| die "Syncing lib/ to $(get_libdir)/ failed"
-		rm -rf lib || die "Removing lib/ failed"
-	fi
-
-	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.060501 /usr/$(get_libdir)/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
-
-	# libGLU doesn't get the plain .so symlink either
-	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
-
-	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
-	# as the default libGL.so.1
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL\.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	if [[ ${CHOST} == *-freebsd* ]]; then
-		# FreeBSD doesn't use major.minor versioning, so the library is only
-		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
-		# libGL.so symlink and leave libGL.so.1 being the real thing
-		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
-	else
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-	fi
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -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} $@"
-}