Bump.

Package-Manager: portage-2.1.1_rc1-r7

4 files changed, 356 insertions, 15 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index d79c92cd004c..4cc61b524b9b 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.105 2006/08/25 20:53:37 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.106 2006/09/16 08:15:07 dberkholz Exp $
+
+*mesa-6.5.1 (16 Sep 2006)
+
+  16 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; +mesa-6.5.1.ebuild:
+  Bump.
 
   25 Aug 2006; Hanno Boeck <hanno@gentoo.org> files/lib/libGL.la,
   mesa-6.4.2-r2.ebuild, mesa-6.5-r3.ebuild, mesa-6.5-r4.ebuild:
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a3ac9f2d4649..3ac8cf8b2e59 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -50,6 +47,7 @@ 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.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
+DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
 EBUILD mesa-6.4.2-r2.ebuild 9466 RMD160 842166624c485a29b0d08a3ed78ae1f2cf4b2479 SHA1 f8de9d11b7fbb298e5dad0689aa2eae827b44639 SHA256 551f738c334be77eaacdb853813cdabb741b16c4d7c5a3d9d32e4dea22b9e7bf
 MD5 bddecc093d2ccc786e7c1e3101721f13 mesa-6.4.2-r2.ebuild 9466
@@ -63,10 +61,14 @@ EBUILD mesa-6.5-r4.ebuild 9197 RMD160 a46afe05b7c85024258dc66c37773c0634665df6 S
 MD5 af8cf0fd55bce47f58db2c1440edea47 mesa-6.5-r4.ebuild 9197
 RMD160 a46afe05b7c85024258dc66c37773c0634665df6 mesa-6.5-r4.ebuild 9197
 SHA256 ffa34ab0dcd60fcbfc20c929f788b6585a9c9d50a1abf989e50df02b70e246a7 mesa-6.5-r4.ebuild 9197
-MISC ChangeLog 19725 RMD160 af3e19c42e88402257ca2fffb6887e3123a8a13f SHA1 83965fab117128116468e93f288b20fa1c025779 SHA256 d54aa3fb13038b25325310501b7b9723857e9f4a5f2a914771c0b4e7fed322ec
-MD5 8093f76cf8b858f031a997dfb61b07ad ChangeLog 19725
-RMD160 af3e19c42e88402257ca2fffb6887e3123a8a13f ChangeLog 19725
-SHA256 d54aa3fb13038b25325310501b7b9723857e9f4a5f2a914771c0b4e7fed322ec ChangeLog 19725
+EBUILD mesa-6.5.1.ebuild 8864 RMD160 201e98bd61d15d3dd3c23b41f14a87520d0ad601 SHA1 9b747a8f87c1621f5b9e194b58ae7e6f450c71a0 SHA256 9a8f52c690e81b27a6cdb488f7771f2c1f80f077711fd5ba614b772de6caded6
+MD5 52b876eff734951b1c0de6b873c016d3 mesa-6.5.1.ebuild 8864
+RMD160 201e98bd61d15d3dd3c23b41f14a87520d0ad601 mesa-6.5.1.ebuild 8864
+SHA256 9a8f52c690e81b27a6cdb488f7771f2c1f80f077711fd5ba614b772de6caded6 mesa-6.5.1.ebuild 8864
+MISC ChangeLog 19840 RMD160 188a8ee3ad7ad9f9f4ac679f55a4a643cc0a9fac SHA1 9de5d24672414bcc5fb448a17e2c33756ad86e3b SHA256 6b866800651ab9240d55201fc45fe71b27b6a22f6fabd526da7a9529c26374fb
+MD5 5e0b7c1642f3f2d903efed8e60c1fb50 ChangeLog 19840
+RMD160 188a8ee3ad7ad9f9f4ac679f55a4a643cc0a9fac ChangeLog 19840
+SHA256 6b866800651ab9240d55201fc45fe71b27b6a22f6fabd526da7a9529c26374fb ChangeLog 19840
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -80,10 +82,6 @@ SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/di
 MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r4 241
 RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r4 241
 SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r4 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE72QFr2QksT29OyARAj91AJ4hKUlcD/s433OZfXi7plkNnYlZZACfcySY
-VsO73bjAcZVEC8HwBKWSgCQ=
-=tkJl
------END PGP SIGNATURE-----
+MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1 247
+RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1 247
+SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1 247
diff --git a/media-libs/mesa/files/digest-mesa-6.5.1 b/media-libs/mesa/files/digest-mesa-6.5.1
new file mode 100644
index 000000000000..45b5cf135d2d
--- /dev/null
+++ b/media-libs/mesa/files/digest-mesa-6.5.1
@@ -0,0 +1,3 @@
+MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257
+RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257
+SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257
diff --git a/media-libs/mesa/mesa-6.5.1.ebuild b/media-libs/mesa/mesa-6.5.1.ebuild
new file mode 100644
index 000000000000..61a1c960ff9e
--- /dev/null
+++ b/media-libs/mesa/mesa-6.5.1.ebuild
@@ -0,0 +1,335 @@
+# 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.1.ebuild,v 1.1 2006/09/16 08:15:07 dberkholz 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
+	doc
+	hardened
+	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 )
+	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 )"
+
+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 up libdir
+	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+
+	# Set default dri drivers directory
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+
+	# Do we want thread-local storage (TLS)?
+	if use nptl; then
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+	fi
+
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+
+	# 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/\$(LIB_DIR)/dri" \
+		INCLUDE_DIR="${D}/usr/include" \
+		install || die "Installation failed"
+
+	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} $@"
+}