modular X improvement

Package-Manager: portage-2.0.53_rc7

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index cd511530433a029464a7d5d6bbd4ecde89f3bb75..d791b21bb108da4784b6481ad65e56a13063013f 100644 (file)
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.6 2005/11/14 17:15:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.7 2005/11/15 00:50:46 lu_zero Exp $
+
+  15 Nov 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.19.10.ebuild:
+  Extended LIBGL_DRIVERS_PATH support
 
   14 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
   ati-drivers-8.14.13-r3.ebuild:

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 70632c0e7f83fd981bb2c580a37d1a64b9032301..cc144cdd1d4437ecedfbe9590baf07b6b8aba810 100644 (file)
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,4 +1,4 @@
-MD5 e7b67318e34d051b5952ba7132c3f3a0 ChangeLog 23762
+MD5 16a25838ec0f6ec185ebafbc4ebdcfcb ChangeLog 23878
 MD5 ad343861ae1ccea97bf3bbcdb61ba9e0 ati-drivers-8.14.13-r2.ebuild 7005
 MD5 fff3d657c788a8d71b363ae449d9a845 ati-drivers-8.14.13-r3.ebuild 7914
 MD5 c49603b680cc13d2dc3cecec1d8b45d7 ati-drivers-8.14.13-r4.ebuild 7497
@@ -9,7 +9,7 @@ MD5 709b23aa0176849c66ed9b1ed702dc29 ati-drivers-8.18.6-r1.ebuild 7910
 MD5 e1a0e8561a29e904bd4f5381da97d219 ati-drivers-8.18.6.ebuild 7086
 MD5 5d3dbd42e474d44115bc1a882763e204 ati-drivers-8.18.8-r1.ebuild 8174
 MD5 c9629a18ef6fc50af7d610577e287d58 ati-drivers-8.18.8.ebuild 7857
-MD5 6291761ff420951b473184d09585af9c ati-drivers-8.19.10.ebuild 8117
+MD5 a5ec7fc8ed800621bb2e4c9b6fcd2916 ati-drivers-8.19.10.ebuild 8218
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198

diff --git a/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
index 9477e258988d7e65b81d12ba3d948e781ad26b62..28a66ebfd7f6275bf0e1d30f889814a0b1e43286 100644 (file)
--- a/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.3 2005/11/13 18:53:49 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.4 2005/11/15 00:50:46 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -164,8 +164,7 @@ pkg_preinst() {
 }
 
 src_install() {
-       local ATI_ROOT="/usr/lib/opengl/ati"
-
+       local ATI_LIBGL_PATH=""
        cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
        linux-mod_src_install
 
@@ -207,11 +206,13 @@ src_install() {
 
        #Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
        if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+               ATI_LIBGL_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri" 
+       fi      
                cat >>${T}/09ati <<EOF
 
-LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+LIBGL_DRIVERS_PATH="$ATI_LIBGL_PATH"
 EOF
-       fi
+       
 
        doenvd ${T}/09ati
 }
@@ -219,6 +220,7 @@ EOF
 src_install-libs() {
        local pkglibdir=lib
        local inslibdir="$(get_libdir)/$xlibdir"
+       ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/$xlibdir/modules/dri"
        if [ ${#} -eq 2 ]; then
                pkglibdir=${1}
                inslibdir=${2}