From b05b628191df9010848a1cfa144567d2dc2cef83 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Wed, 16 Nov 2005 02:28:24 +0000
Subject: Assorted fixes (Portage version: 2.0.53_rc7)

---
 x11-drivers/ati-drivers/ChangeLog                  |  5 ++++-
 x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'x11-drivers')

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 52807a828abf..5ef6719d38eb 100644
--- 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/ati-drivers-8.19.10.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
index f1a37a04cfde..5426fb706274 100644
--- 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}"
-- 
cgit v1.2.3-65-gdbad