forgot to remove the patches

3 files changed, 10 insertions, 26 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index ceb6a75b6bcf..4b2f66b008ac 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.51 2004/10/02 16:26:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.52 2004/10/02 20:39:44 lu_zero Exp $
+
+  02 Oct 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.1.ebuild:
+  Cleanup + remove a stray patch
 
 *ati-drivers-3.14.1 (02 Oct 2004)
 
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 5785018ec78a..99bfbc50184c 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,7 +1,7 @@
 MD5 55084b4637f59dbc056f3c3ea6ac9ef7 ati-drivers-3.2.0.ebuild 4494
 MD5 c097444035f82c48673393e171163f90 ati-drivers-3.7.0.ebuild 5424
 MD5 3a4aabaec1f8705a6e83b19b88ae8e60 ati-drivers-3.12.0.ebuild 4860
-MD5 f207e762fe9f08542ae5572ed3485813 ChangeLog 9102
+MD5 6ee7cbc3838b919a510169a15ef77f96 ChangeLog 9212
 MD5 616152ceacf4338e4dfc14b378413e47 ati-drivers-3.2.5.ebuild 4555
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 d404832f9f2ff434a19c278fdec0bb2e ati-drivers-3.2.8-r2.ebuild 4134
@@ -14,7 +14,7 @@ MD5 a2e898dd45c93552faf9522eb9ee6f85 ati-drivers-3.2.8.ebuild 4561
 MD5 003cc1469c56626052124a10a92b55ea ati-drivers-3.11.1.ebuild 4772
 MD5 9d6164f9cb443fb2fceadee69ec62d0e ati-drivers-3.2.5-r1.ebuild 4580
 MD5 6b5ab1abb7122e2335aeef6de0db7aca ati-drivers-3.2.4.ebuild 4685
-MD5 cd442be56a1037b7c93d542642a886e5 ati-drivers-3.14.1.ebuild 4860
+MD5 bebf0adff260a6c9e81f9930f1c72d7a ati-drivers-3.14.1.ebuild 4347
 MD5 22470cac4821c26539336042f88281f3 ati-drivers-3.9.0-r1.ebuild 4513
 MD5 8eb6d0fd20fa26cd240efd44a74d7e41 ati-drivers-2.9.13.ebuild 3602
 MD5 7427ff67a7d53009779660017e6a35b6 ati-drivers-2.9.13-r1.ebuild 4246
diff --git a/media-video/ati-drivers/ati-drivers-3.14.1.ebuild b/media-video/ati-drivers/ati-drivers-3.14.1.ebuild
index 52cd16f92c33..02dbf808fdee 100644
--- a/media-video/ati-drivers/ati-drivers-3.14.1.ebuild
+++ b/media-video/ati-drivers/ati-drivers-3.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.14.1.ebuild,v 1.1 2004/10/02 16:26:16 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-3.14.1.ebuild,v 1.2 2004/10/02 20:39:44 lu_zero Exp $
 
 IUSE=""
 
@@ -27,24 +27,6 @@ pkg_setup(){
 	check_KV || \
 		die "Please ensure /usr/src/linux points to your kernel symlink!"
 
-	if has_version "x11-base/xfree"
-	then
-		if ! has_version ">=x11-base/xfree-4.3.0"
-		then
-			die "You must upgrade to xfree-4.3.0 or greater to use this."
-		fi
-	fi
-	if has_version "x11-base/xorg-x11"
-	then
-		if has_version ">=x11-base/xorg-x11-6.7.99"
-		then
-			eerror "you are using a xorg-x11 version too new !!!"
-			eerror "You must downgrade to xorg-x11-6.7.0 otherwise"
-			eerror "trying to use opengl will crash X"
-			die "Better safe than sorry."
-		fi
-	fi
-
 	# Set up X11 implementation
 	X11_IMPLEM_P="$(best_version virtual/x11)"
 	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
@@ -62,11 +44,10 @@ src_unpack() {
 
 	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
 
-	if [ "`echo ${KV}|grep 2.6`" ]
-	then
-		epatch ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
+#	if [ "`echo ${KV}|grep 2.6`" ]
+#	then
 #		epatch ${FILESDIR}/fglrx-3.9.0-regparm.patch
-	fi
+#	fi
 }
 
 src_compile() {