Cleanup

(Portage version: 2.0.51.19)

16 files changed, 10 insertions, 739 deletions

diff --git a/media-video/ati-drivers-extra/ChangeLog b/media-video/ati-drivers-extra/ChangeLog
index 00dfb638004b..a497205014b6 100644
--- a/media-video/ati-drivers-extra/ChangeLog
+++ b/media-video/ati-drivers-extra/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/ati-drivers-extra
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.25 2005/02/16 22:23:09 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers-extra/ChangeLog,v 1.26 2005/03/18 02:30:28 lu_zero Exp $
+
+  18 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  -files/fglrx-3.7.0-fix-fglrx_panel-includes.patch,
+  -files/ati-drivers-extra-3.14.1-ui-improvements.patch,
+  -files/ati-drivers-extra-3.14.6-improvements.patch.bz2,
+  -ati-drivers-extra-3.9.0.ebuild, -ati-drivers-extra-3.11.1.ebuild,
+  -ati-drivers-extra-3.12.0.ebuild, -ati-drivers-extra-3.14.1.ebuild,
+  -ati-drivers-extra-3.14.1-r1.ebuild, -ati-drivers-extra-3.14.6.ebuild:
+  Cleanup
 
 *ati-drivers-extra-8.10.19 (16 Feb 2005)
 
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.11.1.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.11.1.ebuild
deleted file mode 100644
index eec323aed2ee..000000000000
--- a/media-video/ati-drivers-extra/ati-drivers-extra-3.11.1.ebuild
+++ /dev/null
@@ -1,96 +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-extra/ati-drivers-extra-3.11.1.ebuild,v 1.3 2005/01/04 20:54:51 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers extra application"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-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
-	=media-video/ati-drivers-${PV}*
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="=media-video/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!"
-	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
-}
-
-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
-
-		# 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
-
-	# not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/{src,share/doc}
-}
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.12.0.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.12.0.ebuild
deleted file mode 100644
index 6793dd6d45df..000000000000
--- a/media-video/ati-drivers-extra/ati-drivers-extra-3.12.0.ebuild
+++ /dev/null
@@ -1,96 +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-extra/ati-drivers-extra-3.12.0.ebuild,v 1.2 2005/01/04 20:54:51 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers extra application"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-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
-	=media-video/ati-drivers-${PV}*
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="=media-video/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!"
-	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
-}
-
-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
-
-		# 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
-
-	# not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/{src,share/doc}
-}
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1-r1.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1-r1.ebuild
deleted file mode 100644
index 33a7232ecfe1..000000000000
--- a/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1-r1.ebuild
+++ /dev/null
@@ -1,100 +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-extra/ati-drivers-extra-3.14.1-r1.ebuild,v 1.3 2005/01/04 20:54:51 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers extra application"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-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
-	=media-video/ati-drivers-${PV}*
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="=media-video/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!"
-	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}/extra/fglrx_panel
-	epatch ${FILESDIR}/${P}-ui-improvements.patch
-}
-
-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/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1.ebuild
deleted file mode 100644
index d213cfff8133..000000000000
--- a/media-video/ati-drivers-extra/ati-drivers-extra-3.14.1.ebuild
+++ /dev/null
@@ -1,96 +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-extra/ati-drivers-extra-3.14.1.ebuild,v 1.3 2005/01/04 20:54:51 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers extra application"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-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
-	=media-video/ati-drivers-${PV}*
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="=media-video/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!"
-	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
-}
-
-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
-
-		# 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
-
-	# not necessary dodoc ${WORKDIR}/usr/share/doc/fglrx/LICENSE.*
-
-	# Removing unused stuff
-	rm -rf ${WORKDIR}/usr/{src,share/doc}
-}
diff --git a/media-video/ati-drivers-extra/ati-drivers-extra-3.14.6.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.14.6.ebuild
deleted file mode 100644
index f38b8976aba5..000000000000
--- a/media-video/ati-drivers-extra/ati-drivers-extra-3.14.6.ebuild
+++ /dev/null
@@ -1,96 +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-extra/ati-drivers-extra-3.14.6.ebuild,v 1.2 2005/01/04 20:54:51 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers extra application"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-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
-	=media-video/ati-drivers-${PV}*
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="=media-video/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}/${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/media-video/ati-drivers-extra/ati-drivers-extra-3.9.0.ebuild b/media-video/ati-drivers-extra/ati-drivers-extra-3.9.0.ebuild
deleted file mode 100644
index b7d52b590dab..000000000000
--- a/media-video/ati-drivers-extra/ati-drivers-extra-3.9.0.ebuild
+++ /dev/null
@@ -1,96 +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-extra/ati-drivers-extra-3.9.0.ebuild,v 1.6 2005/01/04 20:54:51 lu_zero Exp $
-
-IUSE="qt"
-
-inherit eutils rpm
-
-DESCRIPTION="Ati precompiled drivers extra application"
-HOMEPAGE="http://www.ati.com"
-SRC_URI="http://www2.ati.com/drivers/linux/fglrx-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
-	=media-video/ati-drivers-${PV}*
-	qt? ( >=x11-libs/qt-3.0 )"
-
-RDEPEND="=media-video/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!"
-	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
-}
-
-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
-
-		# 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}
-}
diff --git a/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.1-ui-improvements.patch b/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.1-ui-improvements.patch
deleted file mode 100644
index c72f8c243541..000000000000
--- a/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.1-ui-improvements.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- fglrx_panel_sources.orig/main.cpp	2004-06-23 17:35:09.000000000 +0200
-+++ fglrx_panel_sources/main.cpp	2004-09-23 12:49:47.000000000 +0200
-@@ -28,8 +28,6 @@
- //    printf ( "%s\n", lpath.data() ) ;
- //    printf ( "%s\n", lfile.data() ) ;
- 
--    QApplication::setStyle ( new QWindowsStyle ) ;
--
-     QApplication a( argc, argv );
- 
-     if ( fi.exists() )
---- fglrx_panel_sources.orig/Makefile	2004-10-05 01:34:33.743903120 +0200
-+++ fglrx_panel_sources/Makefile	2004-10-05 01:35:18.268134408 +0200
-@@ -404,12 +404,8 @@
- 	cd /var/tmp/portage/ati-drivers-extra-3.14.1-r1/image//opt/ati/bin/. ; rm -f $(BASENAME) ; ln -s $(TARGET0) $(BASENAME)
- 	cp LICENSE.GPL /var/tmp/portage/ati-drivers-extra-3.14.1-r1/image//opt/ati/bin/.
- 	cp LICENSE.QPL /var/tmp/portage/ati-drivers-extra-3.14.1-r1/image//opt/ati/bin/.
--	if  [ $KDEDIR ]; then\
--	  cp fireglcontrol.kdelnk $(KDEDIR)/share/applnk/. ;\
--	  cp ati.xpm $(KDEDIR)/share/icons/. ;\
--	fi
--	if test -d /usr/share/gnome/apps; then \
--	  cp fireglcontrol.desktop /usr/share/gnome/apps/. ;\
-+	if test -d /usr/share/applications; then \
-+	  cp fireglcontrol.desktop /usr/share/applications/. ;\
- 	  if test -d /usr/share/pixmaps; then \
- 	    cp ati.xpm /usr/share/pixmaps/. ;\
- 	  fi ;\
---- fglrx_panel_sources.orig/Makefile	2004-06-23 17:35:04.000000000 +0200
-+++ fglrx_panel_sources/Makefile	2004-09-23 12:58:52.377143856 +0200
-@@ -381,7 +381,6 @@
- depclean:: dep_clean
- 
- clean::
--	@make dep_clean
- 	@rm -f *.o *.bak *~ *% #*
- 	@rm -f $(TARGET0_CC_META) $(BASENAME) $(TARGET0)
- 	@#rm -f $(TARGET0_CC_META) $(BASENAME) $(TARGET0) $(TARGET1) $(TARGET2)
---- fglrx_panel_sources.orig/AdjustPage.cpp	2004-06-23 17:35:04.000000000 +0200
-+++ fglrx_panel_sources/AdjustPage.cpp	2004-09-23 14:39:56.488884576 +0200
-@@ -251,9 +251,9 @@
-   connect ( pUndo, SIGNAL(clicked()), SLOT(OnUndo() ) ) ;
- #endif // FGL_LATER
- 
--  connect ( pSliderRed, SIGNAL(valueChanged(int)), SLOT(OnSliderRed(int) ) ) ;
--  connect ( pSliderGreen, SIGNAL(valueChanged(int)), SLOT(OnSliderGreen(int) ) ) ;
--  connect ( pSliderBlue, SIGNAL(valueChanged(int)), SLOT(OnSliderBlue(int) ) ) ;
-+  connect ( pSliderRed, SIGNAL(sliderMoved(int)), SLOT(OnSliderRed(int) ) ) ;
-+  connect ( pSliderGreen, SIGNAL(sliderMoved(int)), SLOT(OnSliderGreen(int) ) ) ;
-+  connect ( pSliderBlue, SIGNAL(sliderMoved(int)), SLOT(OnSliderBlue(int) ) ) ;
-   connect ( pDefaultRed, SIGNAL(clicked()), SLOT(OnDefaultRed() ) ) ;
-   connect ( pDefaultGreen, SIGNAL(clicked()), SLOT(OnDefaultGreen() ) ) ;
-   connect ( pDefaultBlue, SIGNAL(clicked()), SLOT(OnDefaultBlue() ) ) ;
-@@ -628,7 +628,7 @@
-   if ( CurGamma < GAMMA_MIN ) CurGamma = GAMMA_MIN ;
-   if ( CurGamma > GAMMA_MAX ) CurGamma = GAMMA_MAX ;
-   
--  DeltaGamma = (float)((int)((CurGamma - m_Gamma.red)*100)) / 100 ;
-+  DeltaGamma = CurGamma - m_Gamma.red;
-   m_Gamma.red = CurGamma ;
-   if ( pCouple->isChecked() )
-   {
-@@ -662,7 +662,7 @@
-   if ( CurGamma < GAMMA_MIN ) CurGamma = GAMMA_MIN ;
-   if ( CurGamma > GAMMA_MAX ) CurGamma = GAMMA_MAX ;
-   
--  DeltaGamma = (float)((int)((CurGamma - m_Gamma.green)*100)) / 100 ;
-+  DeltaGamma = CurGamma - m_Gamma.green ;
-   m_Gamma.green = CurGamma ;
-   if ( pCouple->isChecked() )
-   {
-@@ -696,7 +696,7 @@
-   if ( CurGamma < GAMMA_MIN ) CurGamma = GAMMA_MIN ;
-   if ( CurGamma > GAMMA_MAX ) CurGamma = GAMMA_MAX ;
-   
--  DeltaGamma = (float)((int)((CurGamma - m_Gamma.blue)*100)) / 100 ;
-+  DeltaGamma = CurGamma - m_Gamma.blue ;
-   m_Gamma.blue = CurGamma ;
-   if ( pCouple->isChecked() )
-   {
diff --git a/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.6-improvements.patch.bz2 b/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.6-improvements.patch.bz2
deleted file mode 100644
index 2cae545c0a96..000000000000
--- a/media-video/ati-drivers-extra/files/ati-drivers-extra-3.14.6-improvements.patch.bz2
+++ /dev/null
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.11.1 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.11.1
deleted file mode 100644
index ee4d9195febb..000000000000
--- a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.11.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59a9b2446abb5d1adac8bafd7d11e083 fglrx-4.3.0-3.11.1.i386.rpm 3872130
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.12.0 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.12.0
deleted file mode 100644
index 44bf6623c24d..000000000000
--- a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a9b74202635058a701c75bb19f99fb72 fglrx-4.3.0-3.12.0.i386.rpm 4119585
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1
deleted file mode 100644
index 2ae2597cff2e..000000000000
--- a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae7bbeab76a3b08e7e2e769dc3ad6a5a fglrx-4.3.0-3.14.1.i386.rpm 4245341
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1-r1 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1-r1
deleted file mode 100644
index 2ae2597cff2e..000000000000
--- a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ae7bbeab76a3b08e7e2e769dc3ad6a5a fglrx-4.3.0-3.14.1.i386.rpm 4245341
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.6 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.6
deleted file mode 100644
index 0e70fb357b26..000000000000
--- a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.14.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd364b6fd6d7b23b3becfe78aab0f98b fglrx-4.3.0-3.14.6.i386.rpm 4223256
diff --git a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.9.0 b/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.9.0
deleted file mode 100644
index 6ebb92b4580e..000000000000
--- a/media-video/ati-drivers-extra/files/digest-ati-drivers-extra-3.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f7802ee0bbdeb5172673027056e789d fglrx-4.3.0-3.9.0.i386.rpm 4285357
diff --git a/media-video/ati-drivers-extra/files/fglrx-3.7.0-fix-fglrx_panel-includes.patch b/media-video/ati-drivers-extra/files/fglrx-3.7.0-fix-fglrx_panel-includes.patch
deleted file mode 100644
index 93bea6c049bb..000000000000
--- a/media-video/ati-drivers-extra/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
-