Moved from media-video/ati-drivers-extra to x11-apps/ati-drivers-extra.

14 files changed, 767 insertions, 0 deletions

diff --git a/x11-apps/ati-drivers-extra/.#ChangeLog.1.27 b/x11-apps/ati-drivers-extra/.#ChangeLog.1.27
new file mode 100644
index 000000000000..b1fab3b88a0d
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/.#ChangeLog.1.27
@@ -0,0 +1,150 @@
+# ChangeLog for media-video/ati-drivers-extra
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/.#ChangeLog.1.27,v 1.1 2005/11/12 22:30:20 lu_zero Exp $
+
+*ati-drivers-extra-8.13.3 (21 May 2005)
+
+  21 May 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.13.3-improvements.patch.bz2,
+  +ati-drivers-extra-8.13.3.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> as usual for the
+  updates to the improvements patch
+
+*ati-drivers-extra-8.12.10 (11 Apr 2005)
+
+  11 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.12.10-improvements.patch.bz2,
+  +ati-drivers-extra-8.12.10.ebuild:
+  New version
+
+  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)
+
+  16 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.10.19-improvements.patch.bz2,
+  +ati-drivers-extra-8.10.19.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> for the updated patch
+
+  06 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.8.25.ebuild:
+  Marked x86
+
+  21 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.8.25.ebuild:
+  Minor QA fix, enhancements added back
+
+*ati-drivers-extra-8.8.25 (18 Jan 2005)
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  -ati-drivers-extra-3.2.8-r1.ebuild, -ati-drivers-extra-3.7.6.ebuild,
+  +ati-drivers-extra-8.8.25.ebuild:
+  New version
+
+  04 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.14.6.ebuild:
+  Marked x86
+
+*ati-drivers-extra-3.14.6 (12 Nov 2004)
+
+  12 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-3.14.6-improvements.patch.bz2,
+  +ati-drivers-extra-3.14.6.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> and Ernst Persson
+  <ernstp@gmail.com> for the notice and the patches
+
+  20 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.14.1-r1.ebuild:
+  Make sure the .desktop file got installed
+
+*ati-drivers-extra-3.14.1-r1 (20 Oct 2004)
+
+  20 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-3.14.1-ui-improvements.patch,
+  +files/fireglcontrol.desktop, +ati-drivers-extra-3.14.1-r1.ebuild:
+  Improvements from Ernst Persson <ernstp@gmail.com>, see bug #66368
+
+  08 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.14.1.ebuild:
+  Marked stable
+
+*ati-drivers-extra-3.14.1 (04 Oct 2004)
+
+  04 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.14.1.ebuild:
+  New version
+
+*ati-drivers-extra-3.12.0 (14 Sep 2004)
+
+  14 Sep 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.12.0.ebuild:
+  New version, thanks to Steve Bamber <bugzilla@thebambers.me.uk> for pointing it
+
+  30 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.11.1.ebuild:
+  Generic tidy up, see bug #61921
+
+*ati-drivers-extra-3.11.1 (09 Aug 2004)
+
+  09 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.11.1.ebuild:
+  New version
+
+  19 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.9.0.ebuild:
+  Marked stable
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  ati-drivers-extra-3.2.8-r1.ebuild, ati-drivers-extra-3.7.6.ebuild,
+  ati-drivers-extra-3.9.0.ebuild:
+  Fix use invocation
+
+  02 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.2.8-r1.ebuild:
+  Removed an unnecessary dep
+
+  31 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.2.8-r1.ebuild:
+  Minor fix, solution for bug #52519
+
+*ati-drivers-extra-3.9.0 (27 May 2004)
+
+  27 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.9.0.ebuild:
+  New version
+
+  16 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.7.6.ebuild:
+  Eventually fixing the issue
+
+  11 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.7.6.ebuild:
+  Workaround for ~cat/pkg-version not behaving
+
+  10 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-extra-3.7.6.ebuild:
+  Change dep on ati-drivers to dep only on version, not Gentoo revision (#47401).
+
+  11 Mar 2004; Luca Barbato <lu_zero@gentoo.org>
+  files/fglrx-3.7.0-fix-fglrx_panel-includes.patch:
+  Missing patch added
+
+*ati-drivers-extra-3.7.6 (11 Mar 2004)
+
+  11 Mar 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.7.6.ebuild:
+  New version, nwn players beware
+
+*ati-drivers-extra-3.2.8-r1 (24 Feb 2004)
+
+  24 Feb 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.2.8-r1.ebuild, metadata.xml:
+  First import, split from ati-drivers
+
diff --git a/x11-apps/ati-drivers-extra/ChangeLog b/x11-apps/ati-drivers-extra/ChangeLog
new file mode 100644
index 000000000000..ee9a68ae96ac
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ChangeLog
@@ -0,0 +1,216 @@
+# ChangeLog for media-video/ati-drivers-extra
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ati-drivers-extra/ChangeLog,v 1.1 2005/11/12 22:30:20 lu_zero Exp $
+
+  12 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.14.13-improvements.patch.bz2,
+  +files/fireglcontrol.desktop, +metadata.xml,
+  +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:
+  Moved from media-video/ati-drivers-extra to x11-apps/ati-drivers-extra.
+
+*ati-drivers-extra-8.18.8 (28 Oct 2005)
+
+  28 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-8.18.8.ebuild:
+  New version
+
+  16 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.18.6.ebuild:
+  digest fix
+
+*ati-drivers-extra-8.18.6 (15 Oct 2005)
+
+  15 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-8.18.6.ebuild:
+  New version
+
+  04 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/ati-drivers-extra-8.8.25-improvements.patch.bz2,
+  -files/ati-drivers-extra-8.10.19-improvements.patch.bz2,
+  -files/ati-drivers-extra-8.12.10-improvements.patch.bz2,
+  -files/ati-drivers-extra-8.13.3-improvements.patch.bz2,
+  -ati-drivers-extra-8.8.25.ebuild, -ati-drivers-extra-8.10.19.ebuild,
+  -ati-drivers-extra-8.12.10.ebuild, -ati-drivers-extra-8.13.3.ebuild:
+  Removed old versions.
+
+  19 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.14.13.ebuild, ati-drivers-extra-8.16.20.ebuild:
+  .20 masked for now
+
+  19 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.14.13.ebuild:
+  Marked x86
+
+*ati-drivers-extra-8.16.20 (17 Aug 2005)
+
+  17 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-8.16.20.ebuild:
+  New release
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org>
+  ati-drivers-extra-8.8.25.ebuild, ati-drivers-extra-8.10.19.ebuild,
+  ati-drivers-extra-8.12.10.ebuild, ati-drivers-extra-8.13.3.ebuild,
+  ati-drivers-extra-8.14.13.ebuild:
+  Fix qt dep
+
+*ati-drivers-extra-8.14.13 (09 Jun 2005)
+
+  09 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.14.13-improvements.patch.bz2,
+  +ati-drivers-extra-8.14.13.ebuild:
+  New version
+
+  21 May 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.12.10.ebuild:
+  Marked x86
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+*ati-drivers-extra-8.13.3 (21 May 2005)
+
+  21 May 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.13.3-improvements.patch.bz2,
+  +ati-drivers-extra-8.13.3.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> as usual for the
+  updates to the improvements patch
+
+*ati-drivers-extra-8.12.10 (11 Apr 2005)
+
+  11 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.12.10-improvements.patch.bz2,
+  +ati-drivers-extra-8.12.10.ebuild:
+  New version
+
+  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)
+
+  16 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-8.10.19-improvements.patch.bz2,
+  +ati-drivers-extra-8.10.19.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> for the updated patch
+
+  06 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.8.25.ebuild:
+  Marked x86
+
+  21 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-8.8.25.ebuild:
+  Minor QA fix, enhancements added back
+
+*ati-drivers-extra-8.8.25 (18 Jan 2005)
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  -ati-drivers-extra-3.2.8-r1.ebuild, -ati-drivers-extra-3.7.6.ebuild,
+  +ati-drivers-extra-8.8.25.ebuild:
+  New version
+
+  04 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.14.6.ebuild:
+  Marked x86
+
+*ati-drivers-extra-3.14.6 (12 Nov 2004)
+
+  12 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-3.14.6-improvements.patch.bz2,
+  +ati-drivers-extra-3.14.6.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> and Ernst Persson
+  <ernstp@gmail.com> for the notice and the patches
+
+  20 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.14.1-r1.ebuild:
+  Make sure the .desktop file got installed
+
+*ati-drivers-extra-3.14.1-r1 (20 Oct 2004)
+
+  20 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/ati-drivers-extra-3.14.1-ui-improvements.patch,
+  +files/fireglcontrol.desktop, +ati-drivers-extra-3.14.1-r1.ebuild:
+  Improvements from Ernst Persson <ernstp@gmail.com>, see bug #66368
+
+  08 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.14.1.ebuild:
+  Marked stable
+
+*ati-drivers-extra-3.14.1 (04 Oct 2004)
+
+  04 Oct 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.14.1.ebuild:
+  New version
+
+*ati-drivers-extra-3.12.0 (14 Sep 2004)
+
+  14 Sep 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.12.0.ebuild:
+  New version, thanks to Steve Bamber <bugzilla@thebambers.me.uk> for pointing it
+
+  30 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.11.1.ebuild:
+  Generic tidy up, see bug #61921
+
+*ati-drivers-extra-3.11.1 (09 Aug 2004)
+
+  09 Aug 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.11.1.ebuild:
+  New version
+
+  19 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.9.0.ebuild:
+  Marked stable
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  ati-drivers-extra-3.2.8-r1.ebuild, ati-drivers-extra-3.7.6.ebuild,
+  ati-drivers-extra-3.9.0.ebuild:
+  Fix use invocation
+
+  02 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.2.8-r1.ebuild:
+  Removed an unnecessary dep
+
+  31 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.2.8-r1.ebuild:
+  Minor fix, solution for bug #52519
+
+*ati-drivers-extra-3.9.0 (27 May 2004)
+
+  27 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-extra-3.9.0.ebuild:
+  New version
+
+  16 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.7.6.ebuild:
+  Eventually fixing the issue
+
+  11 Apr 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.7.6.ebuild:
+  Workaround for ~cat/pkg-version not behaving
+
+  10 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-extra-3.7.6.ebuild:
+  Change dep on ati-drivers to dep only on version, not Gentoo revision (#47401).
+
+  11 Mar 2004; Luca Barbato <lu_zero@gentoo.org>
+  files/fglrx-3.7.0-fix-fglrx_panel-includes.patch:
+  Missing patch added
+
+*ati-drivers-extra-3.7.6 (11 Mar 2004)
+
+  11 Mar 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.7.6.ebuild:
+  New version, nwn players beware
+
+*ati-drivers-extra-3.2.8-r1 (24 Feb 2004)
+
+  24 Feb 2004; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-extra-3.2.8-r1.ebuild, metadata.xml:
+  First import, split from ati-drivers
+
diff --git a/x11-apps/ati-drivers-extra/Manifest b/x11-apps/ati-drivers-extra/Manifest
new file mode 100644
index 000000000000..d5a6c477dbf6
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/Manifest
@@ -0,0 +1,12 @@
+MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
+MD5 7ab9d9583660611e944690879d989e13 ati-drivers-extra-8.18.8.ebuild 2500
+MD5 3c7fbb86895d607f9739e469540ec363 ati-drivers-extra-8.18.6.ebuild 2680
+MD5 d0ad1d199ef7719f839c09700e765c19 ati-drivers-extra-8.16.20.ebuild 2684
+MD5 cddbbc4d42a0f58ff2fccc5070b363d2 ChangeLog 6801
+MD5 4fdc8921ed50a13c114ba02ad16a67db ati-drivers-extra-8.14.13.ebuild 2659
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-extra-8.14.13 157
+MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-extra-8.18.8 168
+MD5 3e29001f6bcfcec91a4802e6c6e37fc1 files/digest-ati-drivers-extra-8.18.6 156
+MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-extra-8.16.20 158
+MD5 41782adae08060611f324e8c8ddf3de9 files/fireglcontrol.desktop 149
+MD5 071a3c5b95ac48e604a480f037b0e91e files/ati-drivers-extra-8.14.13-improvements.patch.bz2 10459
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
new file mode 100644
index 000000000000..d0970186675b
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.14.13.ebuild
@@ -0,0 +1,93 @@
+# 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.1 2005/11/12 22:30:21 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="~media-video/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
new file mode 100644
index 000000000000..043a0f65b39b
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.16.20.ebuild
@@ -0,0 +1,93 @@
+# 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.1 2005/11/12 22:30:21 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="=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}/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
new file mode 100644
index 000000000000..83437afc4407
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.6.ebuild
@@ -0,0 +1,93 @@
+# 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.18.6.ebuild,v 1.1 2005/11/12 22:30:21 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="=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}/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.8.ebuild b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild
new file mode 100644
index 000000000000..c01e8fe4178f
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/ati-drivers-extra-8.18.8.ebuild
@@ -0,0 +1,86 @@
+# 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.18.8.ebuild,v 1.1 2005/11/12 22:30:21 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? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
+	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
+
+LICENSE="ATI GPL-2 QPL-1.0"
+KEYWORDS="-amd64 ~x86"  # (~amd64 yet to be fixed)(see bug 95684)
+
+DEPEND="=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}
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	mkdir -p ${WORKDIR}/extra
+	einfo "Unpacking fglrx_sample_source.tgz..."
+	tar --no-same-owner -C ${WORKDIR}/extra/ -zxf \
+		${WORKDIR}/common/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}/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
+	sed -e "s:"${OLDBIN}":"${ATIBIN}":"\
+		-i ${WORKDIR}/extra/fglrx_panel/Makefile
+
+	}
+
+src_compile() {
+	einfo "Building fgl_glxgears"
+	cd ${WORKDIR}/extra/fgl_glxgears
+	make -f Makefile.Linux || ewarn "fgl_glxgears not build!"
+
+	if use qt
+	then
+		einfo "Building the QT fglx panel..."
+		cd ${WORKDIR}/extra/fglrx_panel
+		emake || die
+	fi
+}
+
+src_install() {
+	local ATI_ROOT="/usr/lib/opengl/ati"
+
+	# Apps
+	exeinto /opt/ati/bin
+	doexe ${WORKDIR}/extra/fgl_glxgears/fgl_glxgears
+
+	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
+}
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
new file mode 100644
index 000000000000..2373f5c5947e
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/ati-drivers-extra-8.14.13-improvements.patch.bz2
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
new file mode 100644
index 000000000000..5c1bc0c5f191
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.14.13
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000000..1f351a19affd
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.16.20
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000000..b9a1b3a7e463
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.6
@@ -0,0 +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
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
new file mode 100644
index 000000000000..3b61133f0845
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/digest-ati-drivers-extra-8.18.8
@@ -0,0 +1,2 @@
+MD5 0618d75904a4b2dd3a2dc822c093a116 ati-driver-installer-8.18.8-i386.run 62367182
+MD5 71da0e3a3f01b401017d85c3cf16d715 ati-driver-installer-8.18.8-x86_64.run 53490938
diff --git a/x11-apps/ati-drivers-extra/files/fireglcontrol.desktop b/x11-apps/ati-drivers-extra/files/fireglcontrol.desktop
new file mode 100644
index 000000000000..6bb583ca610b
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/files/fireglcontrol.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ATI Control Panel
+Icon=ati.xpm
+Terminal=false
+Type=Application
+Categories=Application;System;
+Exec=fireglcontrol
diff --git a/x11-apps/ati-drivers-extra/metadata.xml b/x11-apps/ati-drivers-extra/metadata.xml
new file mode 100644
index 000000000000..9562eecc105c
--- /dev/null
+++ b/x11-apps/ati-drivers-extra/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>X11-drivers</herd>
+<maintainer>
+  <email>lu_zero@gentoo.org</email>
+</maintainer>
+</pkgmetadata>