New version and cleanup

30 files changed, 45 insertions, 2051 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 2f4e927c6280..7b005568667e 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.57 2005/01/08 08:26:11 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.58 2005/01/18 08:28:04 lu_zero Exp $
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  -files/fglrx-3.7.0-fix-fglrx_panel-includes.patch,
+  -ati-drivers-2.9.12.ebuild, -ati-drivers-2.9.13-r1.ebuild,
+  -ati-drivers-2.9.13.ebuild, -ati-drivers-3.2.0.ebuild,
+  -ati-drivers-3.2.4.ebuild, -ati-drivers-3.2.5-r1.ebuild,
+  -ati-drivers-3.2.5.ebuild, -ati-drivers-3.2.8-r1.ebuild,
+  -ati-drivers-3.2.8-r2.ebuild, -ati-drivers-3.2.8.ebuild,
+  -ati-drivers-3.7.0.ebuild, -ati-drivers-3.7.6-r1.ebuild,
+  -ati-drivers-3.7.6.ebuild:
+  Cleanup
+
+*ati-drivers-8.8.25 (18 Jan 2005)
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.8.25.ebuild:
+  New version, the amd64 support will come later
 
   08 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
   +files/8.08-kernel-2.6.10.patch:
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 5d62bb939e9a..1829aa79eed7 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,54 +1,29 @@
-MD5 8d860fbf33adbd08bbd1221321c4dc34 ati-drivers-3.2.0.ebuild 4492
-MD5 3d6215b0775910bd3982fe8a7453718c ati-drivers-3.7.0.ebuild 5422
 MD5 2ace02f46d6c58b2d2031932f81af225 ati-drivers-3.12.0.ebuild 4860
 MD5 7d92c5a2ea96597e36804d1de46c831d ati-drivers-3.14.6.ebuild 4523
-MD5 846734c1a1f0e521eba644d5db0a039c ChangeLog 9809
-MD5 0dd1b578227ecbfb9b6e29c0a2eafc3f ati-drivers-3.2.5.ebuild 4553
+MD5 174a3ab5cfd4d43f1a233124c79b9494 ChangeLog 10467
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
-MD5 81e17646f0356531565c36e3881cf5ec ati-drivers-3.2.8-r2.ebuild 4132
-MD5 8c0875cca739f44343d480f6eac650ec ati-drivers-2.9.12.ebuild 3600
-MD5 247f9558569f974b161db3d432aaa340 ati-drivers-3.2.8-r1.ebuild 3660
-MD5 b15d3859f4f32a171544f80542f74dbf ati-drivers-3.7.6.ebuild 3660
-MD5 67ed4ee01ed4d7e9c6fd64f859137b7c ati-drivers-3.7.6-r1.ebuild 4127
+MD5 418f5185da5058ca2202794123846e3c ati-drivers-8.8.25.ebuild 4512
 MD5 897d558fbabf5f0fb60c833a326eea6b ati-drivers-3.9.0.ebuild 4123
-MD5 e1c79c4d9777c0d98423f1bc13bc6aa8 ati-drivers-3.2.8.ebuild 4560
 MD5 375a467b7a4e36edf6514421f8f64694 ati-drivers-3.11.1.ebuild 4772
-MD5 c78a664b2a22a76a3e18601f4f8a71aa ati-drivers-3.2.5-r1.ebuild 4578
-MD5 f2944e697a699208207156583a087b1e ati-drivers-3.2.4.ebuild 4684
 MD5 a6f870cc41fb1a75a94e93539a8b8ff4 ati-drivers-3.14.1.ebuild 4346
 MD5 d73ae47566be08fd04b3c11deba4261c ati-drivers-3.9.0-r1.ebuild 4511
-MD5 fc9ff3c432c835b8828cfe9d2d101279 ati-drivers-2.9.13.ebuild 3601
-MD5 140d666bc8578efd8d98040050dd6688 ati-drivers-2.9.13-r1.ebuild 4244
-MD5 0eca691de41a29813f6cd11a54b8a234 files/digest-ati-drivers-3.2.4 81
+MD5 3c7b079f100d7796b44af7288f044730 files/digest-ati-drivers-8.8.25 75
 MD5 54de36d07576ae34efa953192b450dd9 files/digest-ati-drivers-3.11.1 73
-MD5 4765a7db326f308f862b1fe3e211ef0d files/fglrx-3.7.0-fix-fglrx_panel-includes.patch 2168
 MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
-MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r2 78
 MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0-r1 72
-MD5 a2a4f4788a7de4a9c7c0295a2804752f files/digest-ati-drivers-3.7.0 78
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-3.7.6-r1 72
-MD5 170f6d7eb9dc2f6d299a28fb8d54e7e4 files/digest-ati-drivers-2.9.13-r1 151
-MD5 d7df82fba612188346e087bfc2a3a305 files/digest-ati-drivers-3.2.0 81
-MD5 bb9dee9498a1b6e5d14476ae7194afc3 files/digest-ati-drivers-2.9.13 82
 MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-3.14.1 73
 MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
 MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492
 MD5 0332bde3220fd222a5b8742ba68abefc files/digest-ati-drivers-3.12.0 73
-MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8 78
-MD5 caef37ecaa1695f1ffaaff60afb69b42 files/digest-ati-drivers-2.9.12 82
 MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 2f9201d062ecb4b2a980f5be12cf0b34 files/fglrx-3.9.0-regparm.patch 58125
 MD5 3aa542eecb0d477f099932d4340b7493 files/digest-ati-drivers-3.14.6 73
 MD5 bdd76c908aa2a7bb1918b9a6955a0744 files/fglrx-3.2.8-fix-amd-adv-spec.patch 561
 MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5 78
-MD5 caabe690b8e6e629f73b5a60e8f1051f files/digest-ati-drivers-3.2.8-r1 78
 MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
 MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
-MD5 aa891a7464224bd9a07fe0e96f40ef7b files/digest-ati-drivers-3.7.6 72
-MD5 d46e2e3860ee3b4f750f21bfacf9020c files/digest-ati-drivers-3.2.5-r1 78
 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0 72
 MD5 8dfc593069132b05be220d12a24697b4 files/fglrx-3.9.0-allocation.patch 946
 MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
diff --git a/media-video/ati-drivers/ati-drivers-2.9.12.ebuild b/media-video/ati-drivers/ati-drivers-2.9.12.ebuild
deleted file mode 100644
index ec563fe92737..000000000000
--- a/media-video/ati-drivers/ati-drivers-2.9.12.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.12.ebuild,v 1.9 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers for r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="mirror://gentoo/fglrx-glc22-4.3.0-${PV}.i586.tar.gz"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	tar zxf ${DISTDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || ewarn "glx module not built"
-
-	einfo "building the fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	doins lib/modules/fglrx/build_mod/fglrx.o
-
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -f usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild b/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild
deleted file mode 100644
index 18e9c3033e08..000000000000
--- a/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.13-r1.ebuild,v 1.9 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers for r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="mirror://gentoo/fglrx-glc22-4.3.0-${PV}.i586.tar.gz
-		mirror://gentoo/fglrx-$PV-2.6.tar.bz2"
-
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	tar zxf ${DISTDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		einfo "unpacking and building the 2.6 patched module"
-		ewarn "It is a quite experimental fix, please beware!"
-		cd ${WORKDIR}
-		tar -xjf ${DISTDIR}/fglrx-$PV-2.6.tar.bz2 || die
-	fi
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		einfo "building module for 2.6 kernel"
-		cd ${WORKDIR}/fglrx-$PV-2.6
-		GENTOO_ARCH=${ARCH} unset ARCH
-		addwrite "/usr/src/${FK}"
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-			ewarn "glx module not built"
-		ARCH=${GENTOO_ARCH}
-		else
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || ewarn "glx module not built"
-	fi
-
-	einfo "building the fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-	doins fglrx-$PV-2.6/fglrx.ko
-	else
-	doins lib/modules/fglrx/build_mod/fglrx.o
-	fi
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -f usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-2.9.13.ebuild b/media-video/ati-drivers/ati-drivers-2.9.13.ebuild
deleted file mode 100644
index 202c86d39ccf..000000000000
--- a/media-video/ati-drivers/ati-drivers-2.9.13.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-2.9.13.ebuild,v 1.8 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers for r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="mirror://gentoo/fglrx-glc22-4.3.0-${PV}.i586.tar.gz"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	tar zxf ${DISTDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || ewarn "glx module not built"
-
-	einfo "building the fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	doins lib/modules/fglrx/build_mod/fglrx.o
-
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -f usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.2.0.ebuild b/media-video/ati-drivers/ati-drivers-3.2.0.ebuild
deleted file mode 100644
index a98ca5e77258..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.2.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2005 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.2.0.ebuild,v 1.9 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="mirror://gentoo/fglrx-glc22-4.3.0-${PV}.i586.tar.gz"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	tar zxf ${DISTDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		einfo "creating Makefile for kernel 2.6"
-		patch -p1 < ${FILESDIR}/fglrx-2.6-makefile.patch
-		einfo "applying fglrx-2.6-fix-deprecated.patch"
-		patch -p1 < ${FILESDIR}/fglrx-2.6-fix-deprecated.patch
-		einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
-		patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
-		GENTOO_ARCH=${ARCH} unset ARCH
-		addwrite "/usr/src/${FK}"
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-			ewarn "glx module not built"
-		ARCH=${GENTOO_ARCH}
-		else
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || ewarn "glx module not built"
-	fi
-
-	#that is the dirty way to avoid the id -u check
-	#sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	#sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	#chmod +x make.sh
-	#./make.sh || ewarn "glx module not built"
-
-	einfo "building the fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		doins lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -f usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.2.4.ebuild b/media-video/ati-drivers/ati-drivers-3.2.4.ebuild
deleted file mode 100644
index e2b5e4eeb974..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.2.4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2005 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.2.4.ebuild,v 1.10 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="mirror://gentoo/fglrx-glc22-4.3.0-${PV}.i586.tar.gz"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	tar zxf ${DISTDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	einfo "creating Makefile for kernel 2.6"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-makefile.patch
-	einfo "applying fglrx-2.6-fix-deprecated.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-fix-deprecated.patch
-	einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
-	einfo "applying fglrx-2.6-vmalloc-vmaddr"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-	fi
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		GENTOO_ARCH=${ARCH} unset ARCH
-	    addwrite "/usr/src/${FK}"
-	    make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-	    ewarn "glx module not built"
-	    ARCH=${GENTOO_ARCH}
-	else
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || ewarn "glx module not built"
-	fi
-
-	#that is the dirty way to avoid the id -u check
-	#sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	#sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	#chmod +x make.sh
-	#./make.sh || ewarn "glx module not built"
-
-	einfo "building the fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		doins lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -f usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To chance your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild b/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild
deleted file mode 100644
index 2f4d6895e5bb..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2005 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.2.5-r1.ebuild,v 1.12 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/firegl/fglrx-glc22-4.3.0-${PV}.i586.rpm"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A} ||die
-	tar zxf ${WORKDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
-	einfo "applying fglrx-2.6-vmalloc-vmaddr.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-	einfo "applying fglrx-2.6-iminor.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-iminor.patch
-	# test6-mm1 is outdated
-	#einfo "applying fglrx-2.6-tsk_euid.patch"
-	#patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch
-	fi
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		GENTOO_ARCH=${ARCH}
-		unset ARCH
-	    addwrite "/usr/src/${FK}"
-		export _POSIX2_VERSION=199209
-		cp 2.6.x/Makefile .
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-	    ewarn "glx module not built"
-	    ARCH=${GENTOO_ARCH}
-	else
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || ewarn "glx module not built"
-	fi
-
-	einfo "building the fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		doins lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -f usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.2.5.ebuild b/media-video/ati-drivers/ati-drivers-3.2.5.ebuild
deleted file mode 100644
index b32e9361f994..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.2.5.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2005 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.2.5.ebuild,v 1.16 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/firegl/fglrx-glc22-4.3.0-${PV}.i586.rpm"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A} ||die
-	tar zxf ${WORKDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	einfo "applying fglrx-2.6-amd-adv-spec-fix.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-amd-adv-spec-fix.patch
-	einfo "applying fglrx-2.6-vmalloc-vmaddr.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-	einfo "applying fglrx-2.6-iminor.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-iminor.patch
-#	einfo "applying fglrx-2.6-tsk_euid.patch"
-#	patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch
-	fi
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		GENTOO_ARCH=${ARCH}
-		unset ARCH
-	    addwrite "/usr/src/${FK}"
-	    cp 2.6.x/Makefile .
-		export _POSIX2_VERSION=199209
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-	    ewarn "glx module not built"
-	    ARCH=${GENTOO_ARCH}
-	else
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || ewarn "glx module not built"
-	fi
-
-	einfo "building the fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears src
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		doins lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -f usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.2.8-r1.ebuild b/media-video/ati-drivers/ati-drivers-3.2.8-r1.ebuild
deleted file mode 100644
index 64bb7ac85bc8..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.2.8-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2005 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.2.8-r1.ebuild,v 1.6 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE=""
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-glc22-4.3.0-${PV}.i586.rpm"
-SLOT="${KV}"
-LICENSE="ATI"
-KEYWORDS="-* x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	>=x11-base/xfree-4.3.0"
-
-RDEPEND=">=x11-base/xfree-4.3.0"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A} ||die
-	tar zxf ${WORKDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-
-	einfo "applying fglrx-3.2.8-fix-amd-adv-spec.patch"
-	patch < ${FILESDIR}/fglrx-3.2.8-fix-amd-adv-spec.patch
-
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-
-	einfo "applying fglrx-2.6-vmalloc-vmaddr.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-#	einfo "applying fglrx-2.6-iminor.patch"
-#	patch -p1 < ${FILESDIR}/fglrx-2.6-iminor.patch
-#	einfo "applying fglrx-2.6-tsk_euid.patch"
-#	patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch
-	fi
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		GENTOO_ARCH=${ARCH}
-		unset ARCH
-	    addwrite "/usr/src/${FK}"
-	    cp 2.6.x/Makefile .
-		export _POSIX2_VERSION=199209
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-	    ewarn "glx module not built"
-	    ARCH=${GENTOO_ARCH}
-	else
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || die "glx module not built"
-	fi
-
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		doins lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	rm -fR usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
-
-	ewarn "This is a driver only ebuild, for the optional application please"
-	ewarn "emerge ati-drivers-extra"
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.2.8.ebuild b/media-video/ati-drivers/ati-drivers-3.2.8.ebuild
deleted file mode 100644
index c852496c7eef..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.2.8.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2005 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.2.8.ebuild,v 1.10 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-glc22-4.3.0-${PV}.i586.rpm"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${A} ||die
-	tar zxf ${WORKDIR}/fglrx-glc22-4.3.0-${PV}.i586.tar.gz || die
-	mkdir ${WORKDIR}/fglrxgears
-	cd ${WORKDIR}/fglrxgears
-	tar zxf ${WORKDIR}/usr/src/ATI/fglrx_sample_source.tgz || die
-	mv xc/programs/fgl_glxgears/* .
-	cp Makefile.Linux Makefile.Linux.orig || die
-	#defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" Makefile.Linux.orig > Makefile.Linux || die
-	cd ${WORKDIR}
-	local OLDBIN="/usr/X11R6/bin"
-	local ATIBIN="${D}/opt/ati/bin"
-	mkdir fglrx_panel
-	cd fglrx_panel
-	tar zxf ${WORKDIR}/usr/src/ATI/fglrx_panel_sources.tgz || die
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-	Makefile >Makefile.new
-	mv Makefile.new Makefile
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-
-	einfo "applying fglrx-3.2.8-fix-amd-adv-spec.patch"
-	patch < ${FILESDIR}/fglrx-3.2.8-fix-amd-adv-spec.patch
-
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-
-	einfo "applying fglrx-2.6-vmalloc-vmaddr.patch"
-	patch -p1 < ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-#	einfo "applying fglrx-2.6-iminor.patch"
-#	patch -p1 < ${FILESDIR}/fglrx-2.6-iminor.patch
-#	einfo "applying fglrx-2.6-tsk_euid.patch"
-#	patch < ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch
-	fi
-}
-
-pkg_setup(){
-	check_KV || die "please ensure /usr/src/linux points to your kernel symlink"
-}
-
-
-src_compile() {
-	einfo "building the glx module"
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		GENTOO_ARCH=${ARCH}
-		unset ARCH
-	    addwrite "/usr/src/${FK}"
-	    cp 2.6.x/Makefile .
-		export _POSIX2_VERSION=199209
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-	    ewarn "glx module not built"
-	    ARCH=${GENTOO_ARCH}
-	else
-	#that is the dirty way to avoid the id -u check
-	sed -e 's:`id -u`:0:' make.sh >make.sh.new
-	sed -e 's:`uname -r`:${KV}:' make.sh.new >make.sh
-	chmod +x make.sh
-	./make.sh || ewarn "glx module not built"
-	fi
-
-	einfo "building the fgl_glxgears sample"
-	cd ${WORKDIR}/fglrxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build"
-
-	if use qt
-	then
-	einfo "building the qt fglx panel"
-		cd ${WORKDIR}/fglrx_panel
-		emake || die
-	fi
-	#removing stuff
-	einfo "cleaning"
-	cd ${WORKDIR}
-	rm -fR usr/share
-	cd usr/X11R6/
-	rm -fR bin/firegl*.bz2 bin/LICENSE.* bin/fgl_glxgears
-}
-
-pkg_preinst() {
-# clean the dinamic libGL stuff's home to ensure
-# we dont have stale libs floating around
-	if [ -d ${ROOT}/usr/lib/opengl/ati ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-	cd ${WORKDIR}
-
-#drm module
-	insinto /lib/modules/${KV}/video
-	if [ "`echo ${KV}|grep 2.6`" ] ; then
-		doins lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-#dri driver
-	exeinto ${ATI_ROOT}/lib
-	doexe usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	#that is the same as in the xfree
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-#same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm usr/X11R6/lib/libGL.so.1.2
-
-#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe fglrxgears/fgl_glxgears
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe fglrx_panel/fireglcontrol
-	fi
-	rm -fR usr/src/*
-	cp -R usr ${D}
-}
-
-pkg_postinst() {
-	#Ebuild shouldn't do this automatically, just tell the user to do it: (drobbins, 1 May 2003)
-	#otherwise it messes up livecd/gamecd stuff
-	#if [ "${ROOT}" = "/" ]
-	#then
-	#	/usr/sbin/opengl-update ati
-	#fi
-
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
-#drm-module
-	update-modules
-
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.7.0.ebuild b/media-video/ati-drivers/ati-drivers-3.7.0.ebuild
deleted file mode 100644
index 48faa410ab18..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.7.0.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2005 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.7.0.ebuild,v 1.8 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-glc22-4.3.0-${PV}.i386.rpm"
-SLOT="${KV}"
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	>=x11-base/xfree-4.3.0
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="qt? ( >=x11-libs/qt-3.0 )"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	cd ${WORKDIR}
-	rpm_src_unpack
-
-	mkdir -p ${WORKDIR}/extra
-	einfo "Unpacking fglrx_sample_source.tgz..."
-	tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
-		${WORKDIR}/usr/src/ATI/fglrx_sample_source.tgz \
-		|| die "Failed to unpack fglrx_sample_source.tgz!"
-	# Defining USE_GLU allows this to compile with NVIDIA headers just fine
-	sed -e "s:-I/usr/X11R6/include:-D USE_GLU -I/usr/X11R6/include:" \
-		-i ${WORKDIR}/extra/fgl_glxgears/Makefile.Linux || die
-
-	mkdir -p ${WORKDIR}/extra/fglrx_panel
-	einfo "Unpacking fglrx_panel_sources.tgz..."
-	tar --no-same-owner -C ${WORKDIR}/extra/fglrx_panel/ -zxf \
-		${WORKDIR}/usr/src/ATI/fglrx_panel_sources.tgz \
-		|| die "Failed to unpack fglrx_panel_sources.tgz!"
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-		-i ${WORKDIR}/extra/fglrx_panel/Makefile
-
-	# Messed up fglrx_panel headers
-	cd ${WORKDIR}/extra/fglrx_panel
-	epatch ${FILESDIR}/fglrx-3.7.0-fix-fglrx_panel-includes.patch
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	epatch ${FILESDIR}/fglrx-3.2.8-fix-amd-adv-spec.patch
-
-	if [ "`echo ${KV}|grep 2.6`" ]
-	then
-		epatch ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-#		epatch ${FILESDIR}/fglrx-2.6-iminor.patch
-#		epatch ${FILESDIR}/3.2.5-linux-2.6.0-test6-mm.patch
-	fi
-}
-
-pkg_setup(){
-	check_KV || \
-		die "Please ensure /usr/src/linux points to your kernel symlink!"
-}
-
-src_compile() {
-	local GENTOO_ARCH=
-
-	einfo "Building the DRM module..."
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "${KV}" != "${KV/2\.6}" ]
-	then
-		GENTOO_ARCH=${ARCH}
-		unset ARCH
-	    addwrite "/usr/src/${FK}"
-	    cp 2.6.x/Makefile .
-		export _POSIX2_VERSION="199209"
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-			ewarn "DRM module not built"
-	    ARCH=${GENTOO_ARCH}
-	else
-		export _POSIX2_VERSION="199209"
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e 's:`uname -r`:${KV}:' \
-			-i make.sh
-		./make.sh || ewarn "DRM module not built"
-	fi
-
-	einfo "Building the fgl_glxgears sample..."
-	cd ${WORKDIR}/extra/fgl_glxgears
-	make -f Makefile.Linux || ewarn "fgl_glxgears sample not build!"
-
-	if use qt
-	then
-		einfo "Building the QT fglx panel..."
-		cd ${WORKDIR}/extra/fglrx_panel
-		emake || die
-	fi
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/X11R6/bin/{*.bz2,fgl_glxgears}
-}
-
-pkg_preinst() {
-	# Clean the dinamic libGL stuff's home to ensure
-	# we don't have stale libs floating around ...
-	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-
-	cd ${WORKDIR}
-
-	# DRM module
-	insinto /lib/modules/${KV}/video
-	if [ "${KV}" != "${KV/2\.6}" ]
-	then
-		doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-	# OpenGL libs
-	exeinto ${ATI_ROOT}/lib
-	doexe ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	# This is the same as that of xfree ...
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-	# X and DRI driver
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe ${WORKDIR}/usr/X11R6/lib/modules/drivers/fglrx_drv.o
-	exeinto /usr/X11R6/lib/modules/dri
-	doexe ${WORKDIR}/usr/X11R6/lib/modules/dri/fglrx_dri.so
-	rm -f ${WORKDIR}/usr/X11R6/lib/modules/drivers/fglrx_drv.o \
-		${WORKDIR}/usr/X11R6/lib/modules/dri/fglrx_dri.so
-
-	# Same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm -f ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
-
-	# Apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
-	doexe ${WORKDIR}/usr/X11R6/bin/*
-	rm -f ${WORKDIR}/usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
-
-		# Fix the paths in these
-		sed -e 's|/usr/X11R6/|/opt/ati/|g' \
-			-i ${WORKDIR}/usr/share/applnk/fireglcontrol.kdelnk \
-			-i ${WORKDIR}/usr/share/gnome/apps/fireglcontrol.desktop
-	else
-		# Removing unused stuff
-		rm -rf ${WORKDIR}/usr/share/{applnk,gnome,icons,pixmaps}
-	fi
-
-	dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/{src,share/doc}
-	cp -R ${WORKDIR}/usr ${D}/
-}
-
-pkg_postinst() {
-# Ebuild shouldn't do this automatically, just tell the user to do it,
-# otherwise it messes up livecd/gamecd stuff ...  (drobbins, 1 May 2003)
-#	if [ "${ROOT}" = "/" ]
-#	then
-#		/usr/sbin/opengl-update ati
-#	fi
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
-	echo
-
-	# DRM module
-	update-modules
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild b/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild
deleted file mode 100644
index 062b179d25c5..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.7.6-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2005 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.7.6-r1.ebuild,v 1.10 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE=""
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-4.3.0-${PV}.i386.rpm"
-SLOT="${KV}"
-LICENSE="ATI"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	virtual/x11"
-
-RDEPEND="virtual/x11"
-PROVIDE="virtual/opengl"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-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
-
-	# Set up X11 implementation
-	X11_IMPLEM_P="$(best_version virtual/x11)"
-	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-	X11_IMPLEM="${X11_IMPLEM##*\/}"
-	einfo "X11 implementation is ${X11_IMPLEM}."
-}
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	cd ${WORKDIR}
-	rpm_src_unpack
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-
-	if [ "`echo ${KV}|grep 2.6`" ]
-	then
-		epatch ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-		epatch ${FILESDIR}/fglrx-2.6-get-page.patch
-	fi
-}
-
-src_compile() {
-	local GENTOO_ARCH=
-
-	einfo "Building the DRM module..."
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "${KV}" != "${KV/2\.6}" ]
-	then
-		GENTOO_ARCH=${ARCH}
-		unset ARCH
-	    addwrite "/usr/src/${FK}"
-	    cp 2.6.x/Makefile .
-		export _POSIX2_VERSION="199209"
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-			ewarn "DRM module not built"
-	    ARCH=${GENTOO_ARCH}
-	else
-		export _POSIX2_VERSION="199209"
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e 's:`uname -r`:${KV}:' \
-			-i make.sh
-		chmod +x make.sh
-		./make.sh || die "DRM module not built"
-	fi
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/X11R6/bin/{*.bz2,fgl_glxgears}
-}
-
-pkg_preinst() {
-	# Clean the dinamic libGL stuff's home to ensure
-	# we don't have stale libs floating around ...
-	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-
-	cd ${WORKDIR}
-
-	# DRM module
-	insinto /lib/modules/${KV}/video
-	if [ "${KV}" != "${KV/2\.6}" ]
-	then
-		doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-	# OpenGL libs
-	exeinto ${ATI_ROOT}/lib
-	doexe ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	# This is the same as that of the X11 implementation ...
-	dosym ../../${X11_IMPLEM}/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-	# X and DRI driver
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe ${WORKDIR}/usr/X11R6/lib/modules/drivers/fglrx_drv.o
-	exeinto /usr/X11R6/lib/modules/dri
-	doexe ${WORKDIR}/usr/X11R6/lib/modules/dri/fglrx_dri.so
-	rm -f ${WORKDIR}/usr/X11R6/lib/modules/drivers/fglrx_drv.o \
-		${WORKDIR}/usr/X11R6/lib/modules/dri/fglrx_dri.so
-
-	# Same as in the X11 implementation
-	exeinto ${ATI_ROOT}/
-	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
-	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
-	rm -f ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
-
-	dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
-
-	#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/{src,share}
-	cp -R ${WORKDIR}/usr ${D}/
-}
-
-pkg_postinst() {
-# Ebuild shouldn't do this automatically, just tell the user to do it,
-# otherwise it messes up livecd/gamecd stuff ...  (drobbins, 1 May 2003)
-#	if [ "${ROOT}" = "/" ]
-#	then
-#		/usr/sbin/opengl-update ati
-#	fi
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
-	echo
-
-	# DRM module
-	update-modules
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.7.6.ebuild b/media-video/ati-drivers/ati-drivers-3.7.6.ebuild
deleted file mode 100644
index b5bb4b0d3e89..000000000000
--- a/media-video/ati-drivers/ati-drivers-3.7.6.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2005 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.7.6.ebuild,v 1.8 2005/01/08 08:26:11 lu_zero Exp $
-
-IUSE=""
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-4.3.0-${PV}.i386.rpm"
-SLOT="${KV}"
-LICENSE="ATI"
-KEYWORDS="-* ~x86"
-
-DEPEND=">=virtual/linux-sources-2.4
-	app-arch/rpm2targz
-	>=x11-base/xfree-4.3.0"
-
-RDEPEND=">=x11-base/xfree-4.3.0"
-
-ATIBIN="${D}/opt/ati/bin"
-RESTRICT="nostrip"
-
-src_unpack() {
-	local OLDBIN="/usr/X11R6/bin"
-
-	cd ${WORKDIR}
-	rpm_src_unpack
-
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-
-	if [ "`echo ${KV}|grep 2.6`" ]
-	then
-		epatch ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-	fi
-}
-
-pkg_setup(){
-	check_KV || \
-		die "Please ensure /usr/src/linux points to your kernel symlink!"
-}
-
-src_compile() {
-	local GENTOO_ARCH=
-
-	einfo "Building the DRM module..."
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
-	if [ "${KV}" != "${KV/2\.6}" ]
-	then
-		GENTOO_ARCH=${ARCH}
-		unset ARCH
-	    addwrite "/usr/src/${FK}"
-	    cp 2.6.x/Makefile .
-		export _POSIX2_VERSION="199209"
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-			ewarn "DRM module not built"
-	    ARCH=${GENTOO_ARCH}
-	else
-		export _POSIX2_VERSION="199209"
-		# That is the dirty way to avoid the id -u check
-		sed -e 's:`id -u`:0:' \
-			-e 's:`uname -r`:${KV}:' \
-			-i make.sh
-		chmod +x make.sh
-		./make.sh || die "DRM module not built"
-	fi
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/X11R6/bin/{*.bz2,fgl_glxgears}
-}
-
-pkg_preinst() {
-	# Clean the dinamic libGL stuff's home to ensure
-	# we don't have stale libs floating around ...
-	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
-	then
-		rm -rf ${ROOT}/usr/lib/opengl/ati/*
-	fi
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-
-	cd ${WORKDIR}
-
-	# DRM module
-	insinto /lib/modules/${KV}/video
-	if [ "${KV}" != "${KV/2\.6}" ]
-	then
-		doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.ko
-	else
-		doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.o
-	fi
-
-	# OpenGL libs
-	exeinto ${ATI_ROOT}/lib
-	doexe ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
-	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
-	# This is the same as that of xfree ...
-	dosym ../../xfree/lib/libGL.la ${ATI_ROOT}/lib/libGL.la
-
-	# X and DRI driver
-	exeinto /usr/X11R6/lib/modules/drivers
-	doexe ${WORKDIR}/usr/X11R6/lib/modules/drivers/fglrx_drv.o
-	exeinto /usr/X11R6/lib/modules/dri
-	doexe ${WORKDIR}/usr/X11R6/lib/modules/dri/fglrx_dri.so
-	rm -f ${WORKDIR}/usr/X11R6/lib/modules/drivers/fglrx_drv.o \
-		${WORKDIR}/usr/X11R6/lib/modules/dri/fglrx_dri.so
-
-	# Same as in xfree
-	exeinto ${ATI_ROOT}/
-	dosym ../xfree/include ${ATI_ROOT}/include
-	dosym ../xfree/extensions ${ATI_ROOT}/extensions
-	rm -f ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
-
-	dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
-
-	#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
-	exeinto /opt/ati/bin
-	doexe usr/X11R6/bin/*
-	rm usr/X11R6/bin/*
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/{src,share}
-	cp -R ${WORKDIR}/usr ${D}/
-}
-
-pkg_postinst() {
-# Ebuild shouldn't do this automatically, just tell the user to do it,
-# otherwise it messes up livecd/gamecd stuff ...  (drobbins, 1 May 2003)
-#	if [ "${ROOT}" = "/" ]
-#	then
-#		/usr/sbin/opengl-update ati
-#	fi
-
-	echo
-	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
-	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
-	echo
-
-	# DRM module
-	update-modules
-}
diff --git a/media-video/ati-drivers/ati-drivers-3.2.8-r2.ebuild b/media-video/ati-drivers/ati-drivers-8.8.25.ebuild
index 6b7e21a78b1f..5aac369d1bf0 100644
--- a/media-video/ati-drivers/ati-drivers-3.2.8-r2.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.8.25.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/media-video/ati-drivers/ati-drivers-3.2.8-r2.ebuild,v 1.6 2005/01/08 08:26:11 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.8.25.ebuild,v 1.1 2005/01/18 08:28:04 lu_zero Exp $
 
 IUSE=""
 
@@ -8,16 +8,16 @@ inherit eutils rpm
 
 DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
 HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-glc22-4.3.0-${PV}.i586.rpm"
+SRC_URI="http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm"
 SLOT="${KV}"
 LICENSE="ATI"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 
 DEPEND=">=virtual/linux-sources-2.4
 	app-arch/rpm2targz
-	virtual/x11"
+	>=x11-base/xorg-x11-6.8.0"
 
-RDEPEND="virtual/x11"
+RDEPEND=">=x11-base/xorg-x11-6.8.0"
 PROVIDE="virtual/opengl"
 
 ATIBIN="${D}/opt/ati/bin"
@@ -27,14 +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
-
 	# Set up X11 implementation
 	X11_IMPLEM_P="$(best_version virtual/x11)"
 	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
@@ -50,10 +42,12 @@ src_unpack() {
 
 	cd ${WORKDIR}/lib/modules/fglrx/build_mod
 
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
 	if [ "`echo ${KV}|grep 2.6`" ]
 	then
-		epatch ${FILESDIR}/fglrx-2.6-vmalloc-vmaddr.patch
-		epatch ${FILESDIR}/fglrx-2.6-get-page.patch
+		#epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch
+		epatch ${FILESDIR}/8.08-kernel-2.6.10.patch
 	fi
 }
 
@@ -69,8 +63,14 @@ src_compile() {
 	    addwrite "/usr/src/${FK}"
 	    cp 2.6.x/Makefile .
 		export _POSIX2_VERSION="199209"
-		make -C ${ROOT}/usr/src/linux SUBDIRS="`pwd`" modules || \
-			ewarn "DRM module not built"
+		if [ ${KV_MAJOR} -eq 2 -a ${KV_MINOR} -gt 5 -a ${KV_PATCH} -gt 5 ] ;
+		then
+			make -C /usr/src/linux M="`pwd`" modules || \
+				ewarn "DRM module not built"
+		else
+			make -C /usr/src/linux SUBDIRS="`pwd`" modules || \
+				ewarn "DRM module not built"
+		fi
 	    ARCH=${GENTOO_ARCH}
 	else
 		export _POSIX2_VERSION="199209"
@@ -132,7 +132,7 @@ src_install() {
 	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
 	rm -f ${WORKDIR}/usr/X11R6/lib/libGL.so.1.2
 
-	dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
+	# Not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.
 
 	#apps
 	insinto /etc/env.d
@@ -158,7 +158,12 @@ pkg_postinst() {
 	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
 	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
 	echo
-
+	ewarn "***"
+	ewarn "If you are experiencing problems with memory allocation try to add"
+	ewarn "this line to in your X11 configuration file:"
+	ewarn "		Option \"KernelModuleParm\"  \"agplock=0\" "
+	ewarn "That should solve the hangups you could have with Neverwinter Nights"
+	ewarn "***"
 	# DRM module
 	update-modules
 }
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-2.9.12 b/media-video/ati-drivers/files/digest-ati-drivers-2.9.12
deleted file mode 100644
index aca06e0c8877..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-2.9.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1283e7e99f76bec20778a9a6ce8c235a fglrx-glc22-4.3.0-2.9.12.i586.tar.gz 4099224
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-2.9.13 b/media-video/ati-drivers/files/digest-ati-drivers-2.9.13
deleted file mode 100644
index 333f005b1d03..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-2.9.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ccf54cb7ffeb72f72e59b3b0812515b fglrx-glc22-4.3.0-2.9.13.i586.tar.gz 4099233
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-2.9.13-r1 b/media-video/ati-drivers/files/digest-ati-drivers-2.9.13-r1
deleted file mode 100644
index 422a6317e249..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-2.9.13-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0ccf54cb7ffeb72f72e59b3b0812515b fglrx-glc22-4.3.0-2.9.13.i586.tar.gz 4099233
-MD5 d15649d5985cf603fdfc18dce31f48a9 fglrx-2.9.13-2.6.tar.bz2 147753
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.0 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.0
deleted file mode 100644
index 954e49068d4f..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3f2b428522bf299d34efe0acf2c5e7b fglrx-glc22-4.3.0-3.2.0.i586.tar.gz 3869336
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.4 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.4
deleted file mode 100644
index 96806c602671..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 378d8f4ab75d66d45093f2ae186fc00b fglrx-glc22-4.3.0-3.2.4.i586.tar.gz 3889628
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.5 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.5
deleted file mode 100644
index 7956963ef183..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca6afde39dd145c5bdcece5d32c4c172 fglrx-glc22-4.3.0-3.2.5.i586.rpm 4355787
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.5-r1 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.5-r1
deleted file mode 100644
index 7956963ef183..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca6afde39dd145c5bdcece5d32c4c172 fglrx-glc22-4.3.0-3.2.5.i586.rpm 4355787
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.8 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.8
deleted file mode 100644
index 242816afc94c..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 824aaaafd4b4867c2456860ea5eff5ec fglrx-glc22-4.3.0-3.2.8.i586.rpm 4365039
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r1 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r1
deleted file mode 100644
index 242816afc94c..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 824aaaafd4b4867c2456860ea5eff5ec fglrx-glc22-4.3.0-3.2.8.i586.rpm 4365039
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r2 b/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r2
deleted file mode 100644
index 242816afc94c..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.2.8-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 824aaaafd4b4867c2456860ea5eff5ec fglrx-glc22-4.3.0-3.2.8.i586.rpm 4365039
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.7.0 b/media-video/ati-drivers/files/digest-ati-drivers-3.7.0
deleted file mode 100644
index f2fc98b270c7..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7dd12340a2b8525b3a9fa1f310e06141 fglrx-glc22-4.3.0-3.7.0.i386.rpm 2856011
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.7.6 b/media-video/ati-drivers/files/digest-ati-drivers-3.7.6
deleted file mode 100644
index 651bc6ac2468..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8538c3669fd6eab3d17c3669e2d88235 fglrx-4.3.0-3.7.6.i386.rpm 3380217
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-3.7.6-r1 b/media-video/ati-drivers/files/digest-ati-drivers-3.7.6-r1
deleted file mode 100644
index 651bc6ac2468..000000000000
--- a/media-video/ati-drivers/files/digest-ati-drivers-3.7.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8538c3669fd6eab3d17c3669e2d88235 fglrx-4.3.0-3.7.6.i386.rpm 3380217
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.8.25 b/media-video/ati-drivers/files/digest-ati-drivers-8.8.25
new file mode 100644
index 000000000000..d6a649879b1c
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-8.8.25
@@ -0,0 +1 @@
+MD5 8245afc1a5f83634ab1b906b8107cd0c fglrx_6_8_0-8.8.25-1.i386.rpm 3744683
diff --git a/media-video/ati-drivers/files/fglrx-3.7.0-fix-fglrx_panel-includes.patch b/media-video/ati-drivers/files/fglrx-3.7.0-fix-fglrx_panel-includes.patch
deleted file mode 100644
index 93bea6c049bb..000000000000
--- a/media-video/ati-drivers/files/fglrx-3.7.0-fix-fglrx_panel-includes.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- ATITVOExtensions.c.orig	2003-11-11 17:32:14.000000000 +0000
-+++ ATITVOExtensions.c	2003-12-29 19:09:46.790701616 +0000
-@@ -33,68 +33,15 @@
- #include <stdlib.h>
- 
- #include "ATITVOExtensions.h"
--#include "Radeon_extension_tvout.h"
-+#include "TVOExt.h"
- 
- static XExtensionInfo _atitvo_info_data;
--static XExtensionInfo *atitvo_info = &_atitvo_info_data;
--static char *atitvo_extension_name = ATITVOUT_EXTENSION_NAME;
--
- 
- //////////////////////////////////////////////////////////////////////////////
- // private functions
- 
- XExtDisplayInfo *info;
- 
--// X shutdown hook function that will cleanup the opened extension
--static XEXT_GENERATE_CLOSE_DISPLAY (close_display_atitvo, 
--                                    atitvo_info)
--
--// table with X hooks
--static /* const */ XExtensionHooks atitvo_extension_hooks = {
--    NULL,                   /* create_gc */
--    NULL,                   /* copy_gc */
--    NULL,                   /* flush_gc */
--    NULL,                   /* free_gc */
--    NULL,                   /* create_font */
--    NULL,                   /* free_font */
--    close_display_atitvo,   /* close_display */
--    NULL,                   /* wire_to_event */
--    NULL,                   /* event_to_wire */
--    NULL,                   /* error */
--    NULL,                   /* error_string */
--};
--
--// find_display_atitvo - get the display info block for atitvo extension
--static XEXT_GENERATE_FIND_DISPLAY (find_display_atitvo, 
--                                   atitvo_info,
--                                   atitvo_extension_name, 
--                                   &atitvo_extension_hooks, 
--                                   ATITVOUT_NUMBER_EVENTS, 
--                                   NULL)
--
--
--
--static int 
--answerisyes(char *s)
--{
--    if (s[0] == '\'')   /* For fools that type the ' literally. */
--        return tolower(s[1]) == 'y';
--    return tolower(s[0]) == 'y';
--}
--
--
--static void 
--getstring(char *s)
--{
--    char *cp;
--    fgets(s, 80, stdin);
--    cp = strchr(s, '\n');
--    if (cp)
--        *cp=0;
--}
--
--
--
- //////////////////////////////////////////////////////////////////////////////
- // type defines
-