Version bump to latest releases. Drop old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 21 insertions, 482 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 2c8e6259c9e7..7ff8cf4a0686 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.262 2010/03/23 11:20:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.263 2010/03/29 14:57:56 scarabeus Exp $
+
+*mesa-7.8 (29 Mar 2010)
+*mesa-7.7.1 (29 Mar 2010)
+
+  29 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org> -mesa-7.6.1.ebuild,
+  -mesa-7.7-r1.ebuild, -mesa-7.7.1_rc2.ebuild, +mesa-7.7.1.ebuild,
+  -mesa-7.8_rc2.ebuild, +mesa-7.8.ebuild:
+  Version bump to latest releases. Drop old.
 
 *mesa-7.8_rc2 (23 Mar 2010)
 *mesa-7.7.1_rc2 (23 Mar 2010)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 28c2c4e7c95b..5341611a29c4 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -5,21 +5,17 @@ AUX 0001-st-xorg-Adopt-to-new-dirty-clip-rect-type.patch 1135 RMD160 55c85bcf2ae
 AUX lib/libGL.la 729 RMD160 b89950051dfa9d02824eb0b15858855016f92dcc SHA1 32c0aabf00f1590aa7aeca75955b80a04c6c7f15 SHA256 f5e62da033bfb72a56d6290d6030df4d5f687acea456a8f31a765c0c4f532606
 AUX lib/libGLU.la 743 RMD160 34e3adc8e0422a5477a9eaa0fee141e577afeee4 SHA1 c131df3a61b7f193e8a8cea3feeb1f9ff0f1ea7d SHA256 0a8efb7cd557598607ede88af6442574a6999689ddbb7f0f3cbaf53734bfa284
 DIST MesaLib-7.5.2.tar.bz2 4387185 RMD160 0dc74e90afc08bde5b5e714bfb966d5b0750d84e SHA1 582141f8d28267f208c4747bd80689e32cdd6f32 SHA256 8b232fd2e7d8de5e4778f27ef11f7ff8c42c3815efc92144215734378b55e1ad
-DIST MesaLib-7.6.1.tar.bz2 4886995 RMD160 c2bea0898ecfe72a05e64f9021400147ae3e9d6b SHA1 6d99fca5f362d51a95401b4392542eb222e3d0f8 SHA256 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-DIST MesaLib-7.7.1-rc2.tar.bz2 4986416 RMD160 b25778ede49bb875ca91f105487352ff6d8494c2 SHA1 02853b3b8d9bc9c2f94bcb41e6e42baeeb0053f8 SHA256 40204770b192d0dd5a0e243cb5d8aff47f8c567e24a86f3b61810540b5d93669
-DIST MesaLib-7.7.tar.bz2 5000637 RMD160 7edcba70e4e9bb1c6724c43e916c6e4c3e90c0dc SHA1 dc104df86f1cf777dac0bdbe8fd0a43c37918b66 SHA256 6252d7d4190b47f70d0e4ec0edbd5a70f2261c5f6e66859e5fd2572c1df6357a
-DIST MesaLib-7.8-rc2.tar.bz2 5140227 RMD160 706bda07d3b3b6cbb5022af754593822cff54327 SHA1 ad3b0bffa484c67ca91f8f6244387bf0f704964f SHA256 f79fc44a59f11af3d8e7bcad52eaf6b275632a971f60849db3dac055a0170dd5
+DIST MesaLib-7.7.1.tar.bz2 4990250 RMD160 2f0dcc017aa97c364538a9fd29d5cdb247ab7880 SHA1 31500d7e3e3bbf9288b3bee4fbddd26a5e0b7782 SHA256 dc44f73e50d2ccdb96e7b72cc71e56024c198a228112c69c5e86dbc610fd4e84
+DIST MesaLib-7.8.tar.bz2 5140967 RMD160 a4eb4c7446197dc1ae437a5b77b84d69e745e8d9 SHA1 691122531035a318e8812855e1bd94d6a908b912 SHA256 8c85db5844303b806b18fc6bd40a9dccb02d90b54878a94f910674673ba0aa35
 EBUILD mesa-7.5.2.ebuild 7691 RMD160 483cf8426096b4836b2829c623a108f4008bd8ed SHA1 786e3df77391a76ba2c3ddb39e05a71477ae8a1c SHA256 96b2d79b0f9a1f3bd3f4060c2de82aa0060bd37f5e0955b374ae2b63fc7e0134
-EBUILD mesa-7.6.1.ebuild 6578 RMD160 baa8791f9d7afee3e1d9b3d615eb00c4858a14a8 SHA1 2e87a9195a62e20487bf24736b7eaa2b75558f91 SHA256 d858bdbf7e73c757a5bfe2de97e0191b3c3cd0fe82ff1bf45f2ab5785c9ede7a
-EBUILD mesa-7.7-r1.ebuild 5903 RMD160 983caee61556e08f86dde15840bed94410a11685 SHA1 2254eae75212dbd1838903acb78eec66a3ee8391 SHA256 360d688801949e5205d9138ec444aa716b25f3d437e78970e6cfee031301790f
-EBUILD mesa-7.7.1_rc2.ebuild 5971 RMD160 937512108f04b627ab8708dde57cda81e58be9a1 SHA1 a53ec756448c81b57259f7941cda8ca5b73c07e9 SHA256 4e11b2909f00edf52a3fa07b7964b42eeb95827810ed471313bdaedfc360dab3
-EBUILD mesa-7.8_rc2.ebuild 6020 RMD160 e007d583c6250326b1896619ee7c2f660ba8d050 SHA1 23da721b800bcdb93a979a784e8a6c506c15dfd2 SHA256 015bbbebe712e176d741be0ba6296f189f2c28fd5f6b2db643b256c9e59b85ec
-MISC ChangeLog 46266 RMD160 71b849250888f169738375ef17813dc24d9202de SHA1 f7e82f8268ec8d7fc76a2ac54555fc681c26c8c5 SHA256 1b271f208e15aee2f3b038d5135b7ac04c141f2a20f17b97899cdd4b68911fbc
+EBUILD mesa-7.7.1.ebuild 5955 RMD160 0cab5dd850bbddd774b78079954326a4ad3c640c SHA1 dc747edc894fb67e5a1b080841da8f85e29c5972 SHA256 4df9e95727384d5f3e422417bf2495e542c697b07d1f8d7cad512359a43527ef
+EBUILD mesa-7.8.ebuild 6013 RMD160 9ad7491a47c6e39afe2e8605c28f97473c4fa95c SHA1 f18f81fc1cc579538d9c160f4e99bd6250a81311 SHA256 c13badeb0848a22f2e5a99307f8f18760e4e5c57eb635ad5596c8e1f81dc4aa7
+MISC ChangeLog 46547 RMD160 e25ff855fbbf4062f3e54460cd38973c3c0f54c2 SHA1 bdb00643f7067a6edc8167681bd9520d88a8b300 SHA256 54d5e954a27b18c4c3c296038622216ac636ffda37d544f0fe64324b8111f12e
 MISC metadata.xml 344 RMD160 2a7cf045329a3141e5ae1396b497ca0e98a1888b SHA1 b730806d6fa2db3bada9e66dd6b93b9e40d6dfea SHA256 849997a7912f4428382a3bdc6b6b6bdb2928048a274fa865b3c89cd3e89e6dde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuoo+cACgkQHB6c3gNBRYcrbQCgy0Yy8LNE+LWn3yKSw8NV7g21
-bqQAn3AQ3jXKgSbbjKy8SCHbO85mYtl+
-=e3LF
+iEYEARECAAYFAkuwv/8ACgkQHB6c3gNBRYfaLwCeO0uUc14lNkU4zfn4rJ78iOqo
+jkAAn1BLJID+Vd58nInqX3zBONUGUY/e
+=jD/2
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.6.1.ebuild b/media-libs/mesa/mesa-7.6.1.ebuild
deleted file mode 100644
index d519748293cf..000000000000
--- a/media-libs/mesa/mesa-7.6.1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.6.1.ebuild,v 1.1 2009/12/22 13:50:33 nirbheek Exp $
-
-EAPI="2"
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git"
-	EXPERIMENTAL="true"
-	IUSE_VIDEO_CARDS_UNSTABLE="video_cards_nouveau"
-fi
-
-inherit autotools multilib flag-o-matic ${GIT_ECLASS} 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_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/${PV/_rc*/}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE_VIDEO_CARDS="${IUSE_VIDEO_CARDS_UNSTABLE}
-	video_cards_intel
-	video_cards_mach64
-	video_cards_mga
-	video_cards_none
-	video_cards_r128
-	video_cards_radeon
-	video_cards_radeonhd
-	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 gallium motif +nptl pic +xcb kernel_FreeBSD"
-
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	>=app-admin/eselect-opengl-1.1.1-r2
-	dev-libs/expat
-	>=x11-libs/libdrm-2.4.17
-	x11-libs/libICE
-	x11-libs/libX11[xcb?]
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86vm
-	motif? ( x11-libs/openmotif )
-"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-misc/makedepend
-	>=x11-proto/dri2proto-1.99.3
-	>=x11-proto/glproto-1.4.8
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.0.99.1
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, 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
-}
-
-src_unpack() {
-	[[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# The drmClip interface changed with libdrm-2.4.17
-	# bug 297891 (patch from upstream git)
-	epatch "${FILESDIR}/0001-st-xorg-Adopt-to-new-dirty-clip-rect-type.patch"
-
-	# FreeBSD 6.* doesn't have posix_memalign().
-	[[ ${CHOST} == *-freebsd6.* ]] && \
-		sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf r600
-
-	# Configurable DRI drivers
-	driver_enable swrast
-	driver_enable video_cards_intel i810 i915 i965
-	driver_enable video_cards_mach64 mach64
-	driver_enable video_cards_mga mga
-	driver_enable video_cards_r128 r128
-	# ATI has two implementations as video_cards
-	driver_enable video_cards_radeon radeon r200 r300 r600
-	driver_enable video_cards_radeonhd r300 r600
-	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
-
-	# all live (experimental) stuff is wrapped around with experimental variable
-	# so the users cant get to this parts even with enabled useflags (downgrade
-	# from live to stable for example)
-	if [[ -n ${EXPERIMENTAL} ]]; then
-		# nouveau works only with gallium
-		use gallium && myconf="${myconf} $(use_enable video_cards_nouveau gallium-nouveau)"
-		if use video_cards_nouveau && ! use gallium ; then
-			elog "Nouveau driver is available only via gallium interface."
-			elog "Enable gallium useflag if you want to use nouveau."
-			echo
-		fi
-	fi
-
-	myconf="${myconf} $(use_enable gallium)"
-	if use gallium; then
-		elog "Warning gallium interface is highly experimental so use"
-		elog "it only if you feel really really brave."
-		elog
-		elog "Intel: works only i915."
-		elog "Nouveau: only available implementation, so no other choice"
-		elog "Radeon: implementation up to the r500."
-		echo
-		myconf="${myconf}
-			--with-state-trackers=glx,dri,egl,xorg
-			$(use_enable video_cards_nouveau gallium-nouveau)
-			$(use_enable video_cards_intel gallium-intel)"
-		if ! use video_cards_radeon && ! use video_cards_radeonhd; then
-			myconf="${myconf} --disable-gallium-radeon"
-		else
-			myconf="${myconf} --enable-gallium-radeon"
-		fi
-	fi
-
-	# Deactivate assembly code for pic build
-	myconf="${myconf} $(use_enable !pic asm)"
-
-	# --with-driver=dri|xlib|osmesa ; might get changed later to something
-	# else than dri
-	econf \
-		--with-driver=dri \
-		--disable-glut \
-		--without-demos \
-		$(use_enable debug) \
-		$(use_enable motif glw) \
-		$(use_enable motif) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable xcb) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		${myconf}
-}
-
-src_install() {
-	dodir /usr
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Remove redundant headers
-	# GLUT thing
-	rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
-	# Glew includes
-	rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
-		|| die "Removing glew includes failed."
-
-	# 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 "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		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 \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	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
-}
diff --git a/media-libs/mesa/mesa-7.7-r1.ebuild b/media-libs/mesa/mesa-7.7-r1.ebuild
deleted file mode 100644
index e7f5dd392664..000000000000
--- a/media-libs/mesa/mesa-7.7-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7-r1.ebuild,v 1.2 2009/12/28 23:47:30 ssuominen Exp $
-
-EAPI="2"
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git"
-	EXPERIMENTAL="true"
-fi
-
-inherit autotools multilib flag-o-matic ${GIT_ECLASS} 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_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/${PV/_rc*/}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis sunffb svga tdfx via"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD"
-
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	>=app-admin/eselect-opengl-1.1.1-r2
-	dev-libs/expat
-	>=x11-libs/libdrm-2.4.17
-	x11-libs/libICE
-	x11-libs/libX11[xcb?]
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXxf86vm
-	motif? ( x11-libs/openmotif )
-"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-misc/makedepend
-	>=x11-proto/dri2proto-1.99.3
-	>=x11-proto/glproto-1.4.8
-	x11-proto/inputproto
-	>=x11-proto/xextproto-7.0.99.1
-	x11-proto/xf86driproto
-	x11-proto/xf86vidmodeproto
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, 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
-}
-
-src_unpack() {
-	[[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-	# FreeBSD 6.* doesn't have posix_memalign().
-	[[ ${CHOST} == *-freebsd6.* ]] && \
-		sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf r600
-
-	# Configurable DRI drivers
-	driver_enable swrast
-	driver_enable video_cards_intel i810 i915 i965
-	driver_enable video_cards_mach64 mach64
-	driver_enable video_cards_mga mga
-	driver_enable video_cards_r128 r128
-	# ATI has two implementations as video_cards
-	driver_enable video_cards_radeon radeon r200 r300 r600
-	driver_enable video_cards_radeonhd r300 r600
-	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_via unichrome
-
-	myconf="${myconf} $(use_enable gallium)"
-	if use gallium; then
-		elog "You have enabled gallium infrastructure."
-		elog "This infrastructure currently support these drivers:"
-		elog "    Intel: driver not really functional, thus disabled."
-		elog "    Nouveau: only available implementation. Experimental Quality."
-		elog "    Radeon: implementation up to the r500. Testing Quality."
-		elog "    Svga: VMWare Virtual GPU driver. Hic sunt leones."
-		echo
-		myconf="${myconf}
-			--disable-gallium-intel
-			--with-state-trackers=glx,dri,egl
-			$(use_enable video_cards_svga gallium-svga)
-			$(use_enable video_cards_nouveau gallium-nouveau)"
-			#$(use_enable video_cards_intel gallium-intel)"
-		if use video_cards_radeon || use video_cards_radeonhd; then
-			myconf="${myconf} --enable-gallium-radeon"
-		else
-			myconf="${myconf} --disable-gallium-radeon"
-		fi
-	else
-		if use video_cards_nouveau || use video_cards_svga; then
-			elog "SVGA and nouveau drivers are available only via gallium interface."
-			elog "Enable gallium useflag if you insist to use them."
-		fi
-	fi
-
-	# --with-driver=dri|xlib|osmesa || do we need osmesa?
-	econf \
-		--disable-option-checking \
-		--with-driver=dri \
-		--disable-glut \
-		--without-demos \
-		$(use_enable debug) \
-		$(use_enable motif glw) \
-		$(use_enable motif) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable xcb) \
-		$(use_enable !pic asm) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		${myconf}
-}
-
-src_install() {
-	dodir /usr
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	# Remove redundant headers
-	# GLUT thing
-	rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
-	# Glew includes
-	rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
-		|| die "Removing glew includes failed."
-
-	# 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 "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		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 \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	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+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
diff --git a/media-libs/mesa/mesa-7.7.1_rc2.ebuild b/media-libs/mesa/mesa-7.7.1.ebuild
index 36e07f7809b8..4c40759b86f8 100644
--- a/media-libs/mesa/mesa-7.7.1_rc2.ebuild
+++ b/media-libs/mesa/mesa-7.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.1_rc2.ebuild,v 1.1 2010/03/23 11:20:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.1.ebuild,v 1.1 2010/03/29 14:57:56 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ HOMEPAGE="http://mesa3d.sourceforge.net/"
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${MAJOR_MINOR}/RC/${MY_SRC_P}.tar.bz2
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${MY_SRC_P}.tar.bz2
 		${SRC_PATCHES}"
 fi
 
diff --git a/media-libs/mesa/mesa-7.8_rc2.ebuild b/media-libs/mesa/mesa-7.8.ebuild
index 3c1ccfdf0c87..98b51995daba 100644
--- a/media-libs/mesa/mesa-7.8_rc2.ebuild
+++ b/media-libs/mesa/mesa-7.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8_rc2.ebuild,v 1.1 2010/03/23 11:20:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8.ebuild,v 1.1 2010/03/29 14:57:56 scarabeus Exp $
 
 EAPI=3
 
@@ -26,7 +26,7 @@ HOMEPAGE="http://mesa3d.sourceforge.net/"
 if [[ $PV = 9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${MAJOR_MINOR}/RC/${MY_SRC_P}.tar.bz2
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${MAJOR_MINOR}/${MY_SRC_P}.tar.bz2
 		${SRC_PATCHES}"
 fi