Cleanup

(Portage version: 2.1_pre3-r1)

17 files changed, 47 insertions, 228 deletions

diff --git a/x11-apps/ati-drivers-extra/ChangeLog b/x11-apps/ati-drivers-extra/ChangeLog
index 93d3bb5f26c4..4bea25cc5a78 100644
--- a/x11-apps/ati-drivers-extra/ChangeLog
+++ b/x11-apps/ati-drivers-extra/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-apps/ati-drivers-extra
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.6 2006/01/28 14:17:47 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.7 2006/01/28 14:51:19 lu_zero Exp $
+
+  28 Jan 2006; Luca Barbato <lu_zero@gentoo.org>
+  -files/ati-drivers-extra-8.14.13-improvements.patch.bz2,
+  -files/ati-drivers-extra-8.19.10-improvements.patch.bz2,
+  -ati-drivers-extra-8.14.13.ebuild, -ati-drivers-extra-8.16.20.ebuild,
+  ati-drivers-extra-8.18.6.ebuild, ati-drivers-extra-8.18.8.ebuild,
+  ati-drivers-extra-8.19.10.ebuild, ati-drivers-extra-8.20.8.ebuild,
+  ati-drivers-extra-8.21.7.ebuild:
+  Cleanup
 
 *ati-drivers-extra-8.21.7 (28 Jan 2006)
 
diff --git a/x11-apps/ati-drivers-extra/Manifest b/x11-apps/ati-drivers-extra/Manifest
index a9d8894e2026..50c28385c4af 100644
--- a/x11-apps/ati-drivers-extra/Manifest
+++ b/x11-apps/ati-drivers-extra/Manifest
@@ -1,19 +1,13 @@
-MD5 82e17fbcd2e8c858e2f6cd1c360ef713 ChangeLog 7911
-MD5 9af1b3adb27c3b8ff5cf17092321f0e7 ati-drivers-extra-8.14.13.ebuild 2653
-MD5 580f105fba57af8e8893c1f07010dd11 ati-drivers-extra-8.16.20.ebuild 2681
-MD5 10b404a2ce677904315673a48b3b49a0 ati-drivers-extra-8.18.6.ebuild 2677
-MD5 b703301a587202549afb929c1b650261 ati-drivers-extra-8.18.8.ebuild 2497
-MD5 b4d8c79ec9e44ef62a0eb5d3ca14b106 ati-drivers-extra-8.19.10.ebuild 2498
-MD5 a3c707d235873ea3abf7477d7c2c2c2b ati-drivers-extra-8.20.8.ebuild 2571
-MD5 eead23654b2eb4bdb10781c34a7af930 ati-drivers-extra-8.21.7.ebuild 2546
-MD5 071a3c5b95ac48e604a480f037b0e91e files/ati-drivers-extra-8.14.13-improvements.patch.bz2 10459
-MD5 e197888780e3fd826edea4c531493054 files/ati-drivers-extra-8.19.10-improvements.patch.bz2 10510
-MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-extra-8.14.13 157
-MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-extra-8.16.20 158
-MD5 3e29001f6bcfcec91a4802e6c6e37fc1 files/digest-ati-drivers-extra-8.18.6 156
-MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-extra-8.18.8 168
-MD5 77910c352e4cc0789f1e084337fe75c4 files/digest-ati-drivers-extra-8.19.10 170
-MD5 296c8e8d4fe969297f60e5772ccf4058 files/digest-ati-drivers-extra-8.20.8 168
+MD5 46ae921321b71c94f96ece0ed75d5935 ChangeLog 8333
+MD5 358a4e328df164171ca4ff2512365bd2 ati-drivers-extra-8.18.6.ebuild 2675
+MD5 6b3003151ed90950665dd1d040e111ee ati-drivers-extra-8.18.8.ebuild 2561
+MD5 faef5eb37b46c2f6d2b6efa39b4dbd34 ati-drivers-extra-8.19.10.ebuild 2562
+MD5 811fa2d51c71ab349f50a4f1966b9af8 ati-drivers-extra-8.20.8.ebuild 2634
+MD5 92d1130d4d894244748386c8a408685f ati-drivers-extra-8.21.7.ebuild 2544
+MD5 8a748797b3d76cd265e70a73f757e664 files/digest-ati-drivers-extra-8.18.6 156
+MD5 9445a9fca1fcb213c6b29479a3bbbb84 files/digest-ati-drivers-extra-8.18.8 260
+MD5 2bcb0458b44921c7327e12400a2fb2bf files/digest-ati-drivers-extra-8.19.10 262
+MD5 e1d04448f960def7ecf6fd142b5c2a7a files/digest-ati-drivers-extra-8.20.8 260
 MD5 6bcac6dced2d281f72772788a949b39e files/digest-ati-drivers-extra-8.21.7 260
 MD5 965bb91f2860cd9b3518ef46ffbfbdcc files/fglrx_pp_proto.h 4342
 MD5 41782adae08060611f324e8c8ddf3de9 files/fireglcontrol.desktop 149
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild
deleted file mode 100644
index 96f73222114b..000000000000
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm linux-info linux-mod
-
-DESCRIPTION="Ati precompiled drivers extra application"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
-		amd64?
-		( http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
-
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="~amd64 x86"  # (~amd64 yet to be fixed)(see bug 95684)
-
-DEPEND="~x11-drivers/ati-drivers-${PV}
-	qt? ( =x11-libs/qt-3* )"
-
-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!"
-	cd ${WORKDIR}/extra/fglrx_panel
-	epatch ${FILESDIR}/${P}-improvements.patch.bz2
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-		-i ${WORKDIR}/extra/fglrx_panel/Makefile
-
-	}
-
-src_compile() {
-	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}
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-
-	# Apps
-	exeinto /opt/ati/bin
-	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
-	rm -f ${WORKDIR}/usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
-
-		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
-
-		insinto /usr/share/pixmaps/
-		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
-	else
-		# Removing unused stuff
-		rm -rf ${WORKDIR}/usr/share/{applnk,gnome,icons,pixmaps}
-	fi
-
-	# not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/{src,share/doc}
-}
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild
deleted file mode 100644
index a9b63ee12387..000000000000
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm linux-info linux-mod
-
-DESCRIPTION="Ati precompiled drivers extra application"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
-		amd64?
-		( http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
-
-LICENSE="ATI GPL-2 QPL-1.0"
-KEYWORDS="-* -amd64 -x86"  # (~amd64 yet to be fixed)(see bug 95684)
-
-DEPEND="=x11-drivers/ati-drivers-${PV}*
-	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!"
-	cd ${WORKDIR}/extra/fglrx_panel
-	epatch ${FILESDIR}/ati-drivers-extra-8.14.13-improvements.patch.bz2
-	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
-		-i ${WORKDIR}/extra/fglrx_panel/Makefile
-
-	}
-
-src_compile() {
-	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}
-}
-
-src_install() {
-	local ATI_ROOT="/usr/lib/opengl/ati"
-
-	# Apps
-	exeinto /opt/ati/bin
-	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
-	rm -f ${WORKDIR}/usr/X11R6/bin/*
-
-	if use qt
-	then
-		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
-
-		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
-
-		insinto /usr/share/pixmaps/
-		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
-	else
-		# Removing unused stuff
-		rm -rf ${WORKDIR}/usr/share/{applnk,gnome,icons,pixmaps}
-	fi
-
-	# not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/{src,share/doc}
-}
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild
index cc722981a2e7..fd0f18eadb65 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild,v 1.3 2006/01/28 14:51:19 lu_zero Exp $
 
 IUSE="qt"
 
@@ -42,7 +42,7 @@ src_unpack() {
 		${WORKDIR}/usr/src/ATI/fglrx_panel_sources.tgz \
 		|| die "Failed to unpack fglrx_panel_sources.tgz!"
 	cd ${WORKDIR}/extra/fglrx_panel
-	epatch ${FILESDIR}/ati-drivers-extra-8.14.13-improvements.patch.bz2
+	epatch ${DISTDIR}/ati-drivers-extra-8.14.13-improvements.patch.bz2
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
 		-i ${WORKDIR}/extra/fglrx_panel/Makefile
 
@@ -77,7 +77,7 @@ src_install() {
 		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
+		doins ${DISTDIR}/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
 		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild
index 845123512712..4f1e4e2aab53 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild,v 1.2 2005/11/12 23:20:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild,v 1.3 2006/01/28 14:51:19 lu_zero Exp $
 
 IUSE="qt"
 
@@ -9,6 +9,7 @@ inherit eutils rpm linux-info linux-mod
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
 SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
+	mirror://gentoo/ati-drivers-extra-8.19.10-improvements.patch.bz2
 	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
 
 LICENSE="ATI GPL-2 QPL-1.0"
@@ -44,7 +45,7 @@ src_unpack() {
 		${WORKDIR}/common/usr/src/ATI/fglrx_panel_sources.tgz \
 		|| die "Failed to unpack fglrx_panel_sources.tgz!"
 	cd ${WORKDIR}/extra/fglrx_panel
-	epatch ${FILESDIR}/ati-drivers-extra-8.14.13-improvements.patch.bz2
+	epatch ${DISTDIR}/ati-drivers-extra-8.14.13-improvements.patch.bz2
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
 		-i ${WORKDIR}/extra/fglrx_panel/Makefile
 
@@ -75,7 +76,7 @@ src_install() {
 		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
+		doins ${DISTDIR}/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
 		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild
index dc9c538ab8c1..9604cb45b091 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild,v 1.1 2005/11/12 23:20:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.19.10.ebuild,v 1.2 2006/01/28 14:51:19 lu_zero Exp $
 
 IUSE="qt"
 
@@ -9,6 +9,7 @@ inherit eutils rpm linux-info linux-mod
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
 SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
+	mirror://gentoo/ati-drivers-extra-8.19.10-improvements.patch.bz2
 	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
 
 LICENSE="ATI GPL-2 QPL-1.0"
@@ -44,7 +45,7 @@ src_unpack() {
 		${WORKDIR}/common/usr/src/ATI/fglrx_panel_sources.tgz \
 		|| die "Failed to unpack fglrx_panel_sources.tgz!"
 	cd ${WORKDIR}/extra/fglrx_panel
-	epatch ${FILESDIR}/ati-drivers-extra-8.19.10-improvements.patch.bz2
+	epatch ${DISTDIR}/ati-drivers-extra-8.19.10-improvements.patch.bz2
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
 		-i ${WORKDIR}/extra/fglrx_panel/Makefile
 
@@ -75,7 +76,7 @@ src_install() {
 		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
+		doins ${DISTDIR}/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
 		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild
index 6213597b5633..84e7502cbb38 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild,v 1.2 2005/12/13 06:50:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.20.8.ebuild,v 1.3 2006/01/28 14:51:19 lu_zero Exp $
 
 IUSE="qt"
 
@@ -9,6 +9,7 @@ inherit eutils rpm linux-info linux-mod
 DESCRIPTION="Ati precompiled drivers extra application"
 HOMEPAGE="http://www.ati.com"
 SRC_URI="x86? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
+	mirror://gentoo/ati-drivers-extra-8.19.10-improvements.patch.bz2
 	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
 
 LICENSE="ATI GPL-2 QPL-1.0"
@@ -44,11 +45,11 @@ src_unpack() {
 		${WORKDIR}/common/usr/src/ATI/fglrx_panel_sources.tgz \
 		|| die "Failed to unpack fglrx_panel_sources.tgz!"
 	cd ${WORKDIR}/extra/fglrx_panel
-	epatch ${FILESDIR}/ati-drivers-extra-8.19.10-improvements.patch.bz2
+	epatch ${DISTDIR}/ati-drivers-extra-8.19.10-improvements.patch.bz2
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
 		-i ${WORKDIR}/extra/fglrx_panel/Makefile
 	#workaround
-	cp ${FILESDIR}/fglrx_pp_proto.h ${WORKDIR}/extra/fglrx_panel
+	cp ${DISTDIR}/fglrx_pp_proto.h ${WORKDIR}/extra/fglrx_panel
 	}
 
 src_compile() {
@@ -76,7 +77,7 @@ src_install() {
 		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
+		doins ${DISTDIR}/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
 		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
diff --git a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild
index acf694421a72..8dceab2829fe 100644
--- a/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild,v 1.1 2006/01/28 14:17:47 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ati-drivers-extra-8.21.7.ebuild,v 1.2 2006/01/28 14:51:19 lu_zero Exp $
 
 IUSE="qt"
 
@@ -49,7 +49,7 @@ src_unpack() {
 	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
 		-i ${WORKDIR}/extra/fglrx_panel/Makefile
 	#workaround
-	cp ${FILESDIR}/fglrx_pp_proto.h ${WORKDIR}/extra/fglrx_panel
+	cp ${DISTDIR}/fglrx_pp_proto.h ${WORKDIR}/extra/fglrx_panel
 	}
 
 src_compile() {
@@ -77,7 +77,7 @@ src_install() {
 		doexe ${WORKDIR}/extra/fglrx_panel/fireglcontrol
 
 		insinto /usr/share/applications/
-		doins ${FILESDIR}/fireglcontrol.desktop
+		doins ${DISTDIR}/fireglcontrol.desktop
 
 		insinto /usr/share/pixmaps/
 		doins ${WORKDIR}/extra/fglrx_panel/ati.xpm
diff --git a/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.14.13-improvements.patch.bz2 b/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.14.13-improvements.patch.bz2
deleted file mode 100644
index 2373f5c5947e..000000000000
--- a/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.14.13-improvements.patch.bz2
+++ /dev/null
diff --git a/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.19.10-improvements.patch.bz2 b/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.19.10-improvements.patch.bz2
deleted file mode 100644
index 6be62cf2b6c1..000000000000
--- a/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.19.10-improvements.patch.bz2
+++ /dev/null
diff --git a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.14.13 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.14.13
deleted file mode 100644
index 5c1bc0c5f191..000000000000
--- a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.14.13
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5187698cee2edf3dee89bc3eee5729c1 fglrx_6_8_0-8.14.13-1.i386.rpm 8765541
-MD5 fc6c39cdf856955359c6f7087a78581c fglrx64_6_8_0-8.14.13-1.x86_64.rpm 14977136
diff --git a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.16.20 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.16.20
deleted file mode 100644
index 1f351a19affd..000000000000
--- a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.16.20
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 db413c61d9d00a96c6a103fe9cf697d5 fglrx_6_8_0-8.16.20-1.i386.rpm 11463523
-MD5 71524b4690b1df108c2cc5d37f945856 fglrx64_6_8_0-8.16.20-1.x86_64.rpm 16328353
diff --git a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.6 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.6
index b9a1b3a7e463..78caa3dae8fb 100644
--- a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.6
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.6
@@ -1,2 +1,2 @@
-MD5 7d7b2397e5423ce6584b2efe7730754e fglrx_6_8_0-8.18.6-1.i386.rpm 12102933
 MD5 4d2a647586cfac6734a8903d563fd8b0 fglrx64_6_8_0-8.18.6-1.x86_64.rpm 17028932
+MD5 7d7b2397e5423ce6584b2efe7730754e fglrx_6_8_0-8.18.6-1.i386.rpm 12102933
diff --git a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.8 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.8
index 3b61133f0845..41831cccd178 100644
--- a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.8
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.8
@@ -1,2 +1,3 @@
 MD5 0618d75904a4b2dd3a2dc822c093a116 ati-driver-installer-8.18.8-i386.run 62367182
 MD5 71da0e3a3f01b401017d85c3cf16d715 ati-driver-installer-8.18.8-x86_64.run 53490938
+MD5 e197888780e3fd826edea4c531493054 ati-drivers-extra-8.19.10-improvements.patch.bz2 10510
diff --git a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.19.10 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.19.10
index fb430984c6c1..fd1abdfac0b0 100644
--- a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.19.10
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.19.10
@@ -1,2 +1,3 @@
 MD5 e35876bafb54f23cebbaf822646646eb ati-driver-installer-8.19.10-i386.run 63744416
 MD5 6d14ff7c8a28d24a0ba0c55930d5fe6a ati-driver-installer-8.19.10-x86_64.run 54043719
+MD5 e197888780e3fd826edea4c531493054 ati-drivers-extra-8.19.10-improvements.patch.bz2 10510
diff --git a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.20.8 b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.20.8
index dd4ce7ff8bd6..ddbadd26cabf 100644
--- a/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.20.8
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.20.8
@@ -1,2 +1,3 @@
 MD5 d3cd0788936d57c2b6734449c66987f8 ati-driver-installer-8.20.8-i386.run 72229632
 MD5 1ffc8dfe93db24fa18f3dd387e20bbcd ati-driver-installer-8.20.8-x86_64.run 57389816
+MD5 e197888780e3fd826edea4c531493054 ati-drivers-extra-8.19.10-improvements.patch.bz2 10510