Assorted fixes

Package-Manager: portage-2.0.53_rc7

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 52807a828abf9fa79a1d1d06ae5f0dbd64987cc8..5ef6719d38eb74d57d4fb43638586e22efe1d0ac 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.8 2005/11/15 08:43:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.9 2005/11/16 02:28:24 lu_zero Exp $
+
+  16 Nov 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.19.10.ebuild:
+  Fixed the 2.6.14 support and minor changes leading to better modular X support
 
   15 Nov 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.19.10.ebuild:
   Patch removed

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index e9347650ec8050dc3b7b85a72954cb2be9749cd2..a5b409b0c4af84c1fcaa866da3d6e62b700739ee 100644 (file)
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,4 +1,4 @@
-MD5 124a45c6e7ffc4f626cf6517f02d3049 ChangeLog 23972
+MD5 d2b817245bbfe68ca4322e989f789642 ChangeLog 24131
 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 1bc601d626c9fce1f5c33cff423575f1 ati-drivers-8.19.10.ebuild 8136
+MD5 d0ffe8d791657bbabb5c956daea930f3 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 f1a37a04cfde0075747bc55db3c2c9dda1d3aa2c..5426fb706274e6aca736774957648ec4774243d1 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.6 2005/11/15 08:43:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.7 2005/11/16 02:28:24 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -113,9 +113,13 @@ src_unpack() {
 
        cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
 
-#      if kernel_is 2 6
-#      then
-#      fi
+       if kernel_is ge 2 6 14
+       then
+               if use amd64
+               then
+               epatch ${FILESDIR}/fglrx-2.6.14-compat_ioctl.patch
+               fi
+       fi
 }
 
 
@@ -246,11 +250,11 @@ src_install-libs() {
        dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
        fi
        # X and DRI driver
-       if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+       if has_version "<x11-base/xorg-x11-6.8.0-r4"
        then
-               local X11_DIR="/usr/"
-       else
                local X11_DIR="/usr/X11R6/"
+       else
+               local X11_DIR="/usr/"
        fi
 
        local X11_LIB_DIR="${X11_DIR}${inslibdir}"