Fix setting of the default dri drivers directory.

(Portage version: 2.1_pre4-r1)

4 files changed, 17 insertions, 12 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index fe7bac10c391..b51d84018364 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/mesa
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.62 2006/02/02 20:29:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.63 2006/02/02 22:06:04 herbs Exp $
+
+  02 Feb 2006; Herbie Hopkins <herbs@gentoo.org> mesa-6.4.1-r1.ebuild:
+  Fix setting of the default dri drivers directory.
 
   02 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.1-r1.ebuild:
   Add USE=debug support.
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 6687ac836a66..e2376920d72e 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,6 @@
-MD5 637716f2101610914eb3fe54ca684473 ChangeLog 12135
-RMD160 e0e3d3c992d9f87b8b2e43734e47215320f9a9d5 ChangeLog 12135
-SHA256 48808e493845c1feaef54bc9a6f489e507e09dbef8f635f667bc2a7725c5a2c8 ChangeLog 12135
+MD5 18e5bc52c4e520e2dbaddd429b59639d ChangeLog 12259
+RMD160 290d173c5dd15f8f4af0a69dcd0e4d5f8bc1ee3a ChangeLog 12259
+SHA256 7bf3df72b5c4054fbcfa88eaf5a8deedbb944249b603dd67a8721e1bb1f3f52a ChangeLog 12259
 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
@@ -13,9 +13,9 @@ SHA256 32de978461c58b3d6adc44615ed02823c205664cf543cddc31b392da86a6f16f files/6.
 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
-MD5 063dc3bc1f6634ab506e9c8ca8bb05c0 files/digest-mesa-6.4.1-r1 67
-RMD160 7eea2da6ea4f66560716f5e55bdde6e75569a391 files/digest-mesa-6.4.1-r1 67
-SHA256 2d3f3257a431f0e660be270d57f49865d1658e3de5fb6a7867395c317fd18acf files/digest-mesa-6.4.1-r1 67
+MD5 94b7cc18e16181a327c6a10a5bfd5ce7 files/digest-mesa-6.4.1-r1 247
+RMD160 80055e1e1228e3ca7e23b7e1354118ee1944ce55 files/digest-mesa-6.4.1-r1 247
+SHA256 7412f1bf6e3b193b12ebf98336d4ec7dd03f6282f9aafb0c1696d351eca3e5c7 files/digest-mesa-6.4.1-r1 247
 MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
 RMD160 a6882fb5d6d8ad195845bdda3bcbbef2aef79099 files/lib/libGL.la 763
 SHA256 0fb9c02b01c9b2306fac89034144bb3e87aedba0dee0a49203aa18fbf0b706bf files/lib/libGL.la 763
@@ -25,9 +25,9 @@ SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/li
 MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375
 RMD160 30e1c4a45cdd2077edd80043911bf05275493195 files/makedepend-location.patch 375
 SHA256 c0ec505e5fb263d4cde901ce9afe3197346acf67372460a2177231be8425e0ab files/makedepend-location.patch 375
-MD5 3a9ce7e1c56d07e776e34a7f7fe63d3d mesa-6.4.1-r1.ebuild 6042
-RMD160 b398703d21086c7cd94b80580c7eefd6878d66e0 mesa-6.4.1-r1.ebuild 6042
-SHA256 ee68c55de9d1232d76de7356380fb473216ad2c4f0998423c3d4d99cd5acf285 mesa-6.4.1-r1.ebuild 6042
+MD5 ce243511be5ccd07ddff0645a54c7bcc mesa-6.4.1-r1.ebuild 6063
+RMD160 3c53b154a963afda21391a95633706e03ba2d2d3 mesa-6.4.1-r1.ebuild 6063
+SHA256 ae369a2450676bfa13df3162dd588dc6967ac398a14f490d48d13a55d10954d9 mesa-6.4.1-r1.ebuild 6063
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
diff --git a/media-libs/mesa/files/digest-mesa-6.4.1-r1 b/media-libs/mesa/files/digest-mesa-6.4.1-r1
index 0f4cbf1ec9dd..efa86c4ad2e9 100644
--- a/media-libs/mesa/files/digest-mesa-6.4.1-r1
+++ b/media-libs/mesa/files/digest-mesa-6.4.1-r1
@@ -1 +1,3 @@
 MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887
+RMD160 e3a54d6442fa5d6e446bb0b6704bd22c31fb4927 MesaLib-6.4.1.tar.bz2 2913887
+SHA256 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf MesaLib-6.4.1.tar.bz2 2913887
diff --git a/media-libs/mesa/mesa-6.4.1-r1.ebuild b/media-libs/mesa/mesa-6.4.1-r1.ebuild
index 6eb5aee5a23d..1e9287d7a200 100644
--- a/media-libs/mesa/mesa-6.4.1-r1.ebuild
+++ b/media-libs/mesa/mesa-6.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2006/02/02 20:29:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.1-r1.ebuild,v 1.7 2006/02/02 22:06:04 herbs Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic
 
@@ -81,7 +81,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}-amd64-include-assyntax.patch
 
 	# Set default dri drivers directory
-	echo "DRI_DRIVER_DIR = /usr/$(get_libdir)/xorg/modules/dri" >> ${HOSTCONF}
+	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/xorg/modules/dri\"'" >> ${HOSTCONF}
 
 	# Set up linux-dri configs
 	if use sparc; then