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

37 files changed, 4938 insertions, 0 deletions

diff --git a/x11-drivers/ati-drivers/.#ChangeLog.1.115 b/x11-drivers/ati-drivers/.#ChangeLog.1.115
new file mode 100644
index 000000000000..58204d5c64e5
--- /dev/null
+++ b/x11-drivers/ati-drivers/.#ChangeLog.1.115
@@ -0,0 +1,554 @@
+# ChangeLog for media-video/ati-drivers
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/.#ChangeLog.1.115,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+*ati-drivers-8.18.6 (15 Oct 2005)
+
+  15 Oct 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.18.6.ebuild:
+  New version
+
+  08 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r3.ebuild, ati-drivers-8.14.13-r5.ebuild:
+  Backported linux-mod fix.
+
+  02 Oct 2005; Chris Bainbridge <chrb@gentoo.org>
+  ati-drivers-8.16.20-r1.ebuild:
+  Fix linux-mod_src_install call so it actually installs fglrx.
+
+  27 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r3.ebuild, ati-drivers-8.14.13-r5.ebuild,
+  ati-drivers-8.16.20-r1.ebuild:
+  Fixed bug #104216
+
+  15 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/digest-ati-drivers-8.14.13-r5, Manifest:
+  Fix digest
+
+*ati-drivers-8.16.20-r1 (13 Sep 2005)
+*ati-drivers-8.14.13-r5 (13 Sep 2005)
+
+  13 Sep 2005; Herbie Hopkins <herbs@gentoo.org>
+  +ati-drivers-8.14.13-r5.ebuild, +ati-drivers-8.16.20-r1.ebuild:
+  Fix 32bit dri support on amd64, bug 101539.
+
+  10 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.14.13-r3.ebuild,
+  ati-drivers-8.14.13-r4.ebuild, ati-drivers-8.16.20.ebuild:
+  Make it depend on libstdc++ 5
+
+  04 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.14.13-r2.ebuild:
+  Recovered the latest stable ebuild
+
+*ati-drivers-8.14.13-r4 (03 Sep 2005)
+
+  03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/3.2.5-linux-2.6.0-test6-mm.patch,
+  -files/fglrx-2.6.10-pci_get_class.patch, -files/8.08-kernel-2.6.10.patch,
+  -files/fglrx-2.6-amd-adv-spec-fix.patch, -files/fglrx-2.6-get-page.patch,
+  -files/fglrx-2.6-makefile.patch, -files/8.14.13-amd64.patch,
+  -files/fglrx-2.6-fix-deprecated.patch, -files/fglrx-2.6-iminor.patch,
+  -files/fglrx-2.6-pagetable.patch, -files/fglrx-2.6-vmalloc-vmaddr.patch,
+  -ati-drivers-8.8.25-r3.ebuild, -ati-drivers-8.10.19.ebuild,
+  -ati-drivers-8.12.10.ebuild, -ati-drivers-8.13.3.ebuild,
+  -ati-drivers-8.13.4.ebuild, -ati-drivers-8.14.13.ebuild,
+  -ati-drivers-8.14.13-r1.ebuild, -ati-drivers-8.14.13-r2.ebuild,
+  ati-drivers-8.14.13-r3.ebuild, +ati-drivers-8.14.13-r4.ebuild,
+  ati-drivers-8.16.20.ebuild:
+  Clean outold cruft.  Revbump to transition to eselect over opengl-update.
+
+  23 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.16.20.ebuild:
+  BSD support
+
+  19 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.16.20.ebuild:
+  8.16.20 seems to have too many issues.
+  8.14.13-r2 marked stable on x86 and amd64
+
+  18 Aug 2005; Luca Barbato <lu_zero@gentoo.org> ChangeLog:
+  Readded ioctl32.patch for amd64
+
+*ati-drivers-8.16.20 (17 Aug 2005)
+
+  17 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.16.20.ebuild:
+  New release, should support both onboard chips and standard ones
+
+  04 Aug 2005; Luca Barbato <lu_zero@gentoo.org> files/p1.patch:
+  Fix a wrong patch, solves bug #101078
+
+*ati-drivers-8.14.13-r3 (04 Aug 2005)
+
+  04 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.14.13-r3.ebuild:
+  dlloader support, thanks to Wolfgang Kroworsch <wolfgang@kroworsch.de> for
+  the updated ebuild
+
+*ati-drivers-8.14.13-r2 (29 Jul 2005)
+
+  29 Jul 2005; Chris Bainbridge <chrb@gentoo.org> +files/ioctl32.patch,
+  +files/fglrx-8.14.13-alt-2.6.12-agp.patch, +files/p1.patch,
+  +ati-drivers-8.14.13-r2.ebuild:
+  Remove 8.14.13-amd64.patch. Add fglrx-8.14.13-alt-2.6.12-agp.patch,
+  ioctl32.patch, p1.patch. Bug #88767.
+
+*ati-drivers-8.13.4 (25 Jun 2005)
+
+  25 Jun 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.13.4.ebuild:
+  New Xpress 200 driver, p.masked as usual since I cannot test it
+
+  25 Jun 2005; Luca Barbato <lu_zero@gentoo.org> +files/8.14.13-amd64.patch,
+  ati-drivers-8.14.13.ebuild, ati-drivers-8.14.13-r1.ebuild:
+  fix for bug #96740, thanks to Marcin Deranekl <gringo@slonko.net> for
+  reporting and providing the patch
+
+  19 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.12-inter_module_get.patch,
+  files/fglrx-2.6.12-pci_name.patch, ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Final fix for 2.6.12 support
+
+  19 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.12-pci_name.patch, ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Fix for linux 2.6.12
+
+  13 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Fix for the latest driver, thanks to Robinson Sathaseevan
+  <robysath@hotmail.com> for pointing out the issue
+
+  11 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.14.13.ebuild:
+  Fixed wrong URL
+
+  10 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Cosmetic change
+
+*ati-drivers-8.14.13-r1 (09 Jun 2005)
+*ati-drivers-8.14.13 (09 Jun 2005)
+
+  09 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.14.13.ebuild, +ati-drivers-8.14.13-r1.ebuild:
+  New version
+
+*ati-drivers-8.13.3 (21 May 2005)
+
+  21 May 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.13.3.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> as usual for the notice
+
+  07 May 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
+  Marked stable
+
+  04 May 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
+  fix a bogus code in the ebuild, many thanks to Christoph Nodes
+  <cnodes@gmail.com> for pointing the issue and making me fix it
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ati-drivers-8.12.10.ebuild:
+  Make sure we have a valid opengl implementation when uninstalling. Closes
+  bug #55142.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  18 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ati-drivers-8.8.25-r3.ebuild:
+  Stable x86.
+
+  17 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ati-drivers-8.8.25.ebuild:
+  Removing version incompatible with remaining xorg-x11 and opengl-update
+  versions.
+
+  11 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +files/8.8.25-smp.patch,
+  ati-drivers-8.12.10.ebuild:
+  Fix smp issues (bug #72311) and gcc version issues (bug #84834, bug #83897),
+  thanks to every people listed in the bugs for reporting and providing
+  solutions
+
+  10 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
+  Marked ~amd64
+
+  10 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
+  Added kernel features check, warns if fails, in future it will block the ebuild
+
+*ati-drivers-8.12.10 (08 Apr 2005)
+
+  08 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.10.19.ebuild,
+  +ati-drivers-8.12.10.ebuild:
+  New version and minor fix, amd64 requires an updated patch.
+
+  07 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.10.19.ebuild:
+  opengl useflag added
+
+  21 Mar 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.10.19.ebuild:
+  Marked x86
+
+  18 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  -files/fglrx-3.2.8-fix-amd-adv-spec.patch,
+  -files/fglrx-3.9.0-allocation.patch, -files/fglrx-3.9.0-regparm.patch,
+  -ati-drivers-3.9.0.ebuild, -ati-drivers-3.9.0-r1.ebuild,
+  -ati-drivers-3.11.1.ebuild, -ati-drivers-3.12.0.ebuild,
+  -ati-drivers-3.14.1.ebuild, -ati-drivers-3.14.6.ebuild:
+  Cleanup
+
+  24 Feb 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.10.19.ebuild:
+  Minor fix, thanks to Karl Tomlinson <tomlinso+gentoo@esu1.auckland.ac.nz>
+
+  18 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/fglrx-2.6-pagetable.patch:
+  Another typo fixed, thanks to Mark S <mszilveszter@gmail.com> for reporting it
+
+  17 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/fglrx-2.6-pagetable.patch:
+  Fix a typo on the pagetable patch, thanks to Marcelo Penna Guerra
+  <eu@marcelopenna.org> for pointing out
+
+*ati-drivers-8.10.19 (16 Feb 2005)
+
+  16 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.10.19.ebuild:
+  New version
+
+  06 Feb 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  Marked x86
+
+  05 Feb 2005; Dylan Carlson <absinthe@gentoo.org>
+  +files/fglrx-2.6-pagetable.patch, ati-drivers-8.8.25-r3.ebuild:
+  4-level page table patch for 2.6.11 kernels (should be ok with =< 2.6.10 too).
+
+  01 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/8.8.25-via-amd64.patch, ati-drivers-8.8.25-r3.ebuild,
+  ati-drivers-8.8.25.ebuild:
+  Minor changes
+
+*ati-drivers-8.8.25 (01 Feb 2005)
+
+  01 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.8.25-r3.ebuild, +ati-drivers-8.8.25.ebuild:
+  Added back an x86 only ebuild, made the custom header install in the X11_DIR
+  instead of /usr/X11R6
+
+  27 Jan 2005; Luca Barbato <lu_zero@gentoo.org> :
+  Fix for bug #78870
+
+  24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ati-drivers-8.8.25-r3.ebuild:
+  Adding >=x11-base/opengl-update-2.1_pre1 as an RDEPEND for MesaGL relatedness.
+
+*ati-drivers-8.8.25-r3 (24 Jan 2005)
+
+  24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ati-drivers-8.8.25-r1.ebuild, -ati-drivers-8.8.25-r2.ebuild,
+  +ati-drivers-8.8.25-r3.ebuild, -ati-drivers-8.8.25.ebuild:
+  Don't install libMesaGL (bug #47598).  Set proper libdir in .la.
+
+*ati-drivers-8.8.25-r2 (23 Jan 2005)
+
+  23 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.8.25-r2.ebuild:
+  Fixed the libGL.la, solves bug #78937
+
+  21 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.8.25-r1.ebuild:
+  Added back the libGL.la symlink
+
+*ati-drivers-8.8.25-r1 (20 Jan 2005)
+
+  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +ati-drivers-8.8.25-r1.ebuild:
+  Multilib cleanups.
+
+  19 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  typo in the multilib support section, fixed thanks Robert Führicht
+  <the_master_of_disaster@gmx.at>
+
+  19 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  Revert back the include symlink removal
+
+  19 Jan 2005; Luca Barbato <lu_zero@gentoo.org> :
+  fixed amd64 digests
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  Added support for amd64, multilib support should work, converted to the
+  linux-mod eclass.
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  minor change
+
+  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:
+  Adding the official patch
+
+  27 Dec 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.6.ebuild:
+  Marked x86
+
+  12 Nov 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.6.ebuild:
+  Marked ~x86
+
+*ati-drivers-3.14.6 (11 Nov 2004)
+
+  11 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.10-pci_get_class.patch, +ati-drivers-3.14.6.ebuild:
+  New version, linux-2.6.10-rc1 partial support added
+
+  08 Oct 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.1.ebuild:
+  Marked stable
+
+  02 Oct 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.1.ebuild:
+  Cleanup + remove a stray patch
+
+*ati-drivers-3.14.1 (02 Oct 2004)
+
+  02 Oct 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.14.1.ebuild:
+  New version, it still doesn't work with the latest xorg
+
+  24 Sep 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.12.0.ebuild:
+  Minor fix
+
+  23 Sep 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.12.0.ebuild:
+  Pinning the deps, should be a better way to handle the issue
+
+*ati-drivers-3.12.0 (11 Sep 2004)
+
+  11 Sep 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.11.1.ebuild,
+  +ati-drivers-3.12.0.ebuild:
+  New version and added a check for xorg.
+
+  30 Aug 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.11.1.ebuild:
+  Minor cleanup
+
+*ati-drivers-3.11.1 (09 Aug 2004)
+
+  09 Aug 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.11.1.ebuild:
+  New version
+
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-2.9.13-r1.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, ati-drivers-3.9.0-r1.ebuild,
+  ati-drivers-3.9.0.ebuild:
+  /usr/src/linux needs ${ROOT}.
+
+  19 Jun 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.9.0-r1.ebuild:
+  Marked stable
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> 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,
+  ati-drivers-3.9.0.ebuild:
+  Fix use invocation
+
+  03 Jun 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.9.0-r1.ebuild:
+  Reverted the memory allocation patch, added some instructions how to solve
+  that, thanks again Aric Cyr <acyr76@yahoo.ca> for the notice.
+
+*ati-drivers-3.9.0-r1 (02 Jun 2004)
+
+  02 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-3.9.0-allocation.patch, +files/fglrx-3.9.0-regparm.patch,
+  +ati-drivers-3.9.0-r1.ebuild:
+  Various patches to solve different issues, thanks to Tarmo Tanav
+  <sn4ip3r@estprog.ee> for the regparm patch and Aric Cyr <acyr76@yahoo.ca> for
+  the memory allocation fix.
+
+*ati-drivers-3.2.8-r2 (28 May 2004)
+
+  28 May 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.2.8-r2.ebuild:
+  Backport from 3.9.0, thanks to Edward Kaplan <theymight.begiants@verizon.net>
+  for asking it and posting an ebuild.
+
+*ati-drivers-3.9.0 (27 May 2004)
+
+  27 May 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.9.0.ebuild:
+  New version
+
+  27 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6-get-page.patch, ati-drivers-3.7.6-r1.ebuild:
+  Fix for 2.6.7 kernel
+
+  02 May 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-3.7.6-r1.ebuild:
+  Remove needless call to portageq.
+
+  25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-3.7.6-r1.ebuild:
+  Provide virtual/opengl (#30107).
+
+  09 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-3.7.6-r1.ebuild:
+  Fix X11_IMPLEM. Fix from merkaba@quantumfish.com (#47282).
+
+*ati-drivers-3.7.6-r1 (08 Apr 2004)
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-3.7.6-r1.ebuild:
+  Update for xorg-x11 compatibility.
+
+  01 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-2.5.1-r1.ebuild, ati-drivers-2.5.1.ebuild, files/ati-2.5.1.diff:
+  These only work with xfree 4.2 or lower. Since that's not around anymore,
+  these shouldn't be either. Reported by Michael Sterrett
+  <mr_bones_@gentoo.org>.
+
+  11 Mar 2004; Luca Barbato <lu_zero@gentoo.org> :
+  Fixed executable perms
+
+*ati-drivers-3.7.6 (10 Mar 2004)
+
+  10 Mar 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.7.6.ebuild:
+  New version, nwn players beware
+
+*ati-drivers-3.2.8-r1 (24 Feb 2004)
+
+  24 Feb 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.8-r1.ebuild:
+  driver only ebuild, optional stuff in ati-drivers-extra
+
+  30 Dec 2003; Martin Schlemmer <azarah@gentoo.org> ati-drivers-3.7.0.ebuild:
+  Fix path to ATI control panel in .desktop files.
+
+*ati-drivers-3.7.0 (30 Dec 2003)
+
+  30 Dec 2003; Martin Schlemmer <azarah@gentoo.org> ati-drivers-3.7.0.ebuild,
+  files/fglrx-3.7.0-fix-fglrx_panel-includes.patch:
+  Update version.  This closes bug #36743, with thanks for ebuild and patch
+  to Alex Plank <aplank@notsohotmail.com>.  Further did a major overhaul of
+  the ebuild - lots of cleanups and form fixes.
+
+  28 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.8.ebuild:
+  Marked x86.
+
+  12 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.8.ebuild:
+  Small fix: bug #30975, thanks to Wedge_ <wedge__@fastmail.fm> for the
+  suggestion
+
+*ati-drivers-3.2.8 (08 Oct 2003)
+
+  08 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.8.ebuild:
+  New version
+
+  07 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5-r1.ebuild,
+  ati-drivers-3.2.5-r1.ebuild:
+  Removed a patch not required anymore for the latest mm sources.
+
+  02 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5-r1.ebuild,
+  ati-drivers-3.2.5.ebuild:
+  Make direct use of the provided Makefile
+
+*ati-drivers-3.2.5-r1 (30 Sep 2003)
+
+  30 Sep 2003; Brandon Low <lostlogic@gentoo.org> ati-drivers-3.2.5-r1.ebuild:
+  Add support for most recent -mm kernels (1 line patch) and make ebuild a bit
+  neater
+
+  08 Sep 2003 Luca Barbato <lu_zero@gentoo.org> :
+  Removed old 2.9.8 and 2.9.6 ebuilds
+
+*ati-drivers-3.2.5 (05 Sep 2003)
+  
+  05 Sep 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5.ebuild:
+  Some typos fixed
+  
+  05 Sep 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5.ebuild:
+  New Version
+  
+  05 Sep 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.4.ebuild,
+  files/fglrx-2.6-vmalloc-vmaddr.patch:
+  Added a workaround for mm-sources, cleaned a bit the ebuild.
+  thanks to wedge_ for the patch, solves bug #27912
+
+*ati-drivers-3.2.4 (12 Aug 2003)
+
+*ati-drivers-3.2.0 (12 Aug 2003)
+
+  12 Aug 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.0.ebuild,
+  ati-drivers-3.2.4.ebuild, files/fglrx-2.6-amd-adv-spec-fix.patch,
+  files/fglrx-2.6-fix-deprecated.patch, files/fglrx-2.6-makefile.patch:
+  New versions, thanks to Wedge_ for the work.
+
+  22 Jul 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.13-r1.ebuild,
+  ChangeLog: Added experimental support for 2.6 kernels.
+
+*ati-drivers-2.9.13 (03 Jul 2003)
+  
+  03 Jul 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.13.ebuild,
+  ChangeLog: Version bump, support for later board.
+
+*ati-drivers-2.9.12 (19 May 2003)
+  
+  19 May 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.12.ebuild,
+  ChangeLog: Updated, thanks to Koen Geeraerts <ir007252@worldonline.be>
+  for the notice.
+
+  11 May 2003; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-2.5.1-r1.ebuild, ati-2.5.1.diff: Added a patch to solve 
+  bug #20104, backported drobbins' tweaks.
+   
+  01 May 2003; Daniel Robbins <drobbins@gentoo.org>
+  ati-drivers-2.9.8.ebuild: Tweaked compile process to work even with NVIDIA
+  headers (defined USE_GLU,) moved unpack stuff to src_unpack, and removed
+  automatic calls to "opengl-update" (messed up gamecd.) Also unmasking for
+  x86. And no longer installs app sources. And now auto-downloads and unpacks
+  everthing. And dep fixes :)
+
+*ati-drivers-2.9.8 (26 Apr 2003)
+  
+  26 Feb 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.8.ebuild,
+  ChangeLog: New update, should had support to the 9800 serie.
+
+  23 Apr 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.6.ebuild,
+  ati-drivers-2.5.1-r1,ChangeLog : Fix some stuff
+
+*ati-drivers-2.9.6 (3 Apr 2003)
+  3 Apr 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.6.ebuild,
+    ChangeLog :
+    As requested I update the ebuild, I do not suggest the use of those
+    drivers
+
+  1 Mar 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.5.1-r1.ebuild,
+    ChangeLog:
+    make sure that the opengl is set to xfree while compiling and after 
+    unmerge.
+
+*ati-drivers-2.5.1-r1 (3 Feb 2003)
+  3 Feb 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.5.1-r1.ebuild,
+    ChangeLog, files/digest-ati-drivers-2.5.1-r1:
+    add the xfree dependency to avoid the xfree 4.2.99 incompatibility.
+    removed the previous ebuild.
+
+*ati-drivers-2.5.1 (26 Dec 2002)
+  
+  26 Dec 2002;Brad Cowan <bcowan@gentoo.org> ati-drivers-2.5.1.ebuild,
+    ChangeLog, files/digest-ati-drivers-2.5.1: Initial import.
+   
+  29 Nov 2002; Luca Barbato <lu_zero@psxfanatics.com> ati-drivers-2.5.1.ebuild,
+  ChangeLog, files/digest-ati-drivers-2.5.1:
+  Initial ebuild for the ati precompiled drivers.
+  The idea of using cpio is from the icc ebuilds, the rest is from the nvidia-*
+  ebuilds.
+
diff --git a/x11-drivers/ati-drivers/.#Manifest.1.178 b/x11-drivers/ati-drivers/.#Manifest.1.178
new file mode 100644
index 000000000000..8a823c6810af
--- /dev/null
+++ b/x11-drivers/ati-drivers/.#Manifest.1.178
@@ -0,0 +1,24 @@
+MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
+MD5 b0e07b107756bc3303e04b578b67d9a1 ati-drivers-8.14.13-r2.ebuild 6687
+MD5 a9b57562fc5eb6509d0d7b73d07980aa ati-drivers-8.18.6.ebuild 6994
+MD5 a37cb5612ebeb94a8e4fa889c88c7c9e ati-drivers-8.14.13-r4.ebuild 7495
+MD5 177f0fbb02a0c4fdae62f6f90ab9ac87 ati-drivers-8.14.13-r5.ebuild 7778
+MD5 142444f733b464a3c075fac4415aef50 ati-drivers-8.16.20.ebuild 6227
+MD5 9924b9695a2602cd6a716d7847319990 ChangeLog 20628
+MD5 a4cd7f5d2d2e8eeb7eefc69ca3f538fb ati-drivers-8.14.13-r3.ebuild 7672
+MD5 9f31103cb72e7f3a236941fa70891c5a ati-drivers-8.16.20-r1.ebuild 6512
+MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
+MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20-r1 158
+MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
+MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
+MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
+MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
+MD5 f9f041748aecb53d3f8bda5ae2563589 files/digest-ati-drivers-8.18.6 155
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r5 157
+MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
+MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120
diff --git a/x11-drivers/ati-drivers/.#ati-drivers-8.14.13.ebuild.1.1 b/x11-drivers/ati-drivers/.#ati-drivers-8.14.13.ebuild.1.1
new file mode 100644
index 000000000000..4c26c7ebd0e8
--- /dev/null
+++ b/x11-drivers/ati-drivers/.#ati-drivers-8.14.13.ebuild.1.1
@@ -0,0 +1,261 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/.#ati-drivers-8.14.13.ebuild.1.1,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="x86? (
+http://www2.ati.com/drivers/linux/ati-driver-installer-${PV}-IA32.run )
+	 amd64? (
+	 http://www2.ati.com/drivers/linux/64bit/ati-driver-installer-${PV}-x86_64.run )"
+
+LICENSE="ATI"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 >=x11-base/opengl-update-2.1_pre1"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+## MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	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"
+
+	sh ${DISTDIR}/${A} --extract ${WORKDIR}/fglrx &>/dev/null \
+		|| die "Unpack failed"
+	cp -af ${WORKDIR}/fglrx/common/* ${WORKDIR}
+
+	if use amd64 ;
+	then
+	cp -af ${WORKDIR}/fglrx/x680_64a/* ${WORKDIR}
+	fi
+
+	if use x86 ;
+	then
+	cp -af ${WORKDIR}/fglrx/x680/* ${WORKDIR}
+	fi
+
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+
+#	if kernel_is 2 6
+#	then
+#		epatch ${FILESDIR}/fglrx-2.6-pagetable.patch
+#	fi
+	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+	epatch ${FILESDIR}/8.8.25-smp.patch
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+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_FULL}/video
+	# set_kvobj
+	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+}
+
+
+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
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	update-modules
+}
+
+pkg_postrm() {
+	opengl-update --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/.#ati-drivers-8.16.20.ebuild.1.2 b/x11-drivers/ati-drivers/.#ati-drivers-8.16.20.ebuild.1.2
new file mode 100644
index 000000000000..ae97f37320e6
--- /dev/null
+++ b/x11-drivers/ati-drivers/.#ati-drivers-8.16.20.ebuild.1.2
@@ -0,0 +1,247 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/.#ati-drivers-8.16.20.ebuild.1.2,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="-*" #~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 >=x11-base/opengl-update-2.1_pre1"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	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
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+#	if kernel_is 2 6
+#	then
+#	fi
+	epatch ${FILESDIR}/ioctl32.patch
+	
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+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_FULL}/video
+	# set_kvobj
+	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+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\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	update-modules
+}
+
+pkg_postrm() {
+	opengl-update --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
new file mode 100644
index 000000000000..f6e3f9eff142
--- /dev/null
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -0,0 +1,613 @@
+# ChangeLog for media-video/ati-drivers
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+  12 Nov 2005; Luca Barbato <lu_zero@gentoo.org> +files/09ati,
+  +files/fglrx-2.6.12-inter_module_get.patch,
+  +files/fglrx-2.6.14-access_ok.patch, +files/8.8.25-smp.patch,
+  +files/p1.patch, +files/fglrx-2.6.12-pci_name.patch,
+  +files/fglrx-2.6.14-compat_ioctl.patch, +.#ati-drivers-8.14.13.ebuild.1.1,
+  +files/8.8.25-via-amd64.patch, +files/fglrx-8.14.13-alt-2.6.12-agp.patch,
+  +.#ati-drivers-8.16.20.ebuild.1.2, +files/ioctl32.patch, +metadata.xml,
+  +ati-drivers-8.14.13-r2.ebuild, +ati-drivers-8.14.13-r3.ebuild,
+  +ati-drivers-8.14.13-r4.ebuild, +ati-drivers-8.14.13-r5.ebuild,
+  +ati-drivers-8.16.20.ebuild, +ati-drivers-8.16.20-r1.ebuild,
+  +ati-drivers-8.18.6.ebuild, +ati-drivers-8.18.6-r1.ebuild,
+  +ati-drivers-8.18.8.ebuild, +ati-drivers-8.18.8-r1.ebuild:
+  Moved from media-video/ati-drivers to x11-drivers/ati-drivers.
+
+  06 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.18.8-r1.ebuild:
+  Minor fix for modular X
+
+  05 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.18.8-r1.ebuild:
+  compat_ioctl should apply just on amd64 for now, I'll properly fix later
+
+*ati-drivers-8.18.8-r1 (04 Nov 2005)
+
+  04 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.14-access_ok.patch,
+  +files/fglrx-2.6.14-compat_ioctl.patch, +ati-drivers-8.18.8-r1.ebuild:
+  New ebuild with linux 2.6.14 and modular X support, thanks to Mike Auty
+  <m.auty@softhome.net> and George L. Emigh <george@georgelemigh.com>, kernel
+  patches from ati unofficial bugzilla
+
+*ati-drivers-8.18.8 (28 Oct 2005)
+
+  28 Oct 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.18.8.ebuild:
+  New version
+
+*ati-drivers-8.18.6-r1 (27 Oct 2005)
+
+  27 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.18.6-r1.ebuild:
+  New version with improved xorg and gcc support, thanks to Robert Führicht
+  <the_master_of_disaster@gmx.at>
+
+  22 Oct 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.18.6.ebuild:
+  Minor changes
+
+  19 Oct 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.18.6.ebuild:
+  Fix the verify_area/access_ok symbol, as reported in bug #109493 (thank you
+  Alex Giouzenis <agios@computer.org>), fixed the bug #109689 ( thank you Jakub
+  Argasiñski <argasek@tekla.art.pl>)
+
+  16 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/digest-ati-drivers-8.18.6, Manifest:
+  digest fix
+
+*ati-drivers-8.18.6 (15 Oct 2005)
+
+  15 Oct 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.18.6.ebuild:
+  New version
+
+  08 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  ati-drivers-8.14.13-r3.ebuild, ati-drivers-8.14.13-r5.ebuild:
+  close quotes
+
+  08 Oct 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r3.ebuild, ati-drivers-8.14.13-r5.ebuild:
+  Backported linux-mod fix.
+
+  02 Oct 2005; Chris Bainbridge <chrb@gentoo.org>
+  ati-drivers-8.16.20-r1.ebuild:
+  Fix linux-mod_src_install call so it actually installs fglrx.
+
+  27 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r3.ebuild, ati-drivers-8.14.13-r5.ebuild,
+  ati-drivers-8.16.20-r1.ebuild:
+  Fixed bug #104216
+
+  15 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/digest-ati-drivers-8.14.13-r5, Manifest:
+  Fix digest
+
+*ati-drivers-8.16.20-r1 (13 Sep 2005)
+*ati-drivers-8.14.13-r5 (13 Sep 2005)
+
+  13 Sep 2005; Herbie Hopkins <herbs@gentoo.org>
+  +ati-drivers-8.14.13-r5.ebuild, +ati-drivers-8.16.20-r1.ebuild:
+  Fix 32bit dri support on amd64, bug 101539.
+
+  10 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.14.13-r3.ebuild,
+  ati-drivers-8.14.13-r4.ebuild, ati-drivers-8.16.20.ebuild:
+  Make it depend on libstdc++ 5
+
+  04 Sep 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.14.13-r2.ebuild:
+  Recovered the latest stable ebuild
+
+*ati-drivers-8.14.13-r4 (03 Sep 2005)
+
+  03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/3.2.5-linux-2.6.0-test6-mm.patch,
+  -files/fglrx-2.6.10-pci_get_class.patch, -files/8.08-kernel-2.6.10.patch,
+  -files/fglrx-2.6-amd-adv-spec-fix.patch, -files/fglrx-2.6-get-page.patch,
+  -files/fglrx-2.6-makefile.patch, -files/8.14.13-amd64.patch,
+  -files/fglrx-2.6-fix-deprecated.patch, -files/fglrx-2.6-iminor.patch,
+  -files/fglrx-2.6-pagetable.patch, -files/fglrx-2.6-vmalloc-vmaddr.patch,
+  -ati-drivers-8.8.25-r3.ebuild, -ati-drivers-8.10.19.ebuild,
+  -ati-drivers-8.12.10.ebuild, -ati-drivers-8.13.3.ebuild,
+  -ati-drivers-8.13.4.ebuild, -ati-drivers-8.14.13.ebuild,
+  -ati-drivers-8.14.13-r1.ebuild, -ati-drivers-8.14.13-r2.ebuild,
+  ati-drivers-8.14.13-r3.ebuild, +ati-drivers-8.14.13-r4.ebuild,
+  ati-drivers-8.16.20.ebuild:
+  Clean outold cruft.  Revbump to transition to eselect over opengl-update.
+
+  23 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.16.20.ebuild:
+  BSD support
+
+  19 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.16.20.ebuild:
+  8.16.20 seems to have too many issues.
+  8.14.13-r2 marked stable on x86 and amd64
+
+  18 Aug 2005; Luca Barbato <lu_zero@gentoo.org> ChangeLog:
+  Readded ioctl32.patch for amd64
+
+*ati-drivers-8.16.20 (17 Aug 2005)
+
+  17 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.16.20.ebuild:
+  New release, should support both onboard chips and standard ones
+
+  04 Aug 2005; Luca Barbato <lu_zero@gentoo.org> files/p1.patch:
+  Fix a wrong patch, solves bug #101078
+
+*ati-drivers-8.14.13-r3 (04 Aug 2005)
+
+  04 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.14.13-r3.ebuild:
+  dlloader support, thanks to Wolfgang Kroworsch <wolfgang@kroworsch.de> for
+  the updated ebuild
+
+*ati-drivers-8.14.13-r2 (29 Jul 2005)
+
+  29 Jul 2005; Chris Bainbridge <chrb@gentoo.org> +files/ioctl32.patch,
+  +files/fglrx-8.14.13-alt-2.6.12-agp.patch, +files/p1.patch,
+  +ati-drivers-8.14.13-r2.ebuild:
+  Remove 8.14.13-amd64.patch. Add fglrx-8.14.13-alt-2.6.12-agp.patch,
+  ioctl32.patch, p1.patch. Bug #88767.
+
+*ati-drivers-8.13.4 (25 Jun 2005)
+
+  25 Jun 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.13.4.ebuild:
+  New Xpress 200 driver, p.masked as usual since I cannot test it
+
+  25 Jun 2005; Luca Barbato <lu_zero@gentoo.org> +files/8.14.13-amd64.patch,
+  ati-drivers-8.14.13.ebuild, ati-drivers-8.14.13-r1.ebuild:
+  fix for bug #96740, thanks to Marcin Deranekl <gringo@slonko.net> for
+  reporting and providing the patch
+
+  19 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.12-inter_module_get.patch,
+  files/fglrx-2.6.12-pci_name.patch, ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Final fix for 2.6.12 support
+
+  19 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.12-pci_name.patch, ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Fix for linux 2.6.12
+
+  13 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Fix for the latest driver, thanks to Robinson Sathaseevan
+  <robysath@hotmail.com> for pointing out the issue
+
+  11 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.14.13.ebuild:
+  Fixed wrong URL
+
+  10 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.14.13.ebuild,
+  ati-drivers-8.14.13-r1.ebuild:
+  Cosmetic change
+
+*ati-drivers-8.14.13-r1 (09 Jun 2005)
+*ati-drivers-8.14.13 (09 Jun 2005)
+
+  09 Jun 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.14.13.ebuild, +ati-drivers-8.14.13-r1.ebuild:
+  New version
+
+*ati-drivers-8.13.3 (21 May 2005)
+
+  21 May 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.13.3.ebuild:
+  New version, thanks to Erdroh Moshan <ErDroh@gmx.de> as usual for the notice
+
+  07 May 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
+  Marked stable
+
+  04 May 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
+  fix a bogus code in the ebuild, many thanks to Christoph Nodes
+  <cnodes@gmail.com> for pointing the issue and making me fix it
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ati-drivers-8.12.10.ebuild:
+  Make sure we have a valid opengl implementation when uninstalling. Closes
+  bug #55142.
+
+  25 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; metadata.xml:
+  Update herd to x11-drivers.
+
+  18 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ati-drivers-8.8.25-r3.ebuild:
+  Stable x86.
+
+  17 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ati-drivers-8.8.25.ebuild:
+  Removing version incompatible with remaining xorg-x11 and opengl-update
+  versions.
+
+  11 Apr 2005; Luca Barbato <lu_zero@gentoo.org> +files/8.8.25-smp.patch,
+  ati-drivers-8.12.10.ebuild:
+  Fix smp issues (bug #72311) and gcc version issues (bug #84834, bug #83897),
+  thanks to every people listed in the bugs for reporting and providing
+  solutions
+
+  10 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
+  Marked ~amd64
+
+  10 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.12.10.ebuild:
+  Added kernel features check, warns if fails, in future it will block the ebuild
+
+*ati-drivers-8.12.10 (08 Apr 2005)
+
+  08 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.10.19.ebuild,
+  +ati-drivers-8.12.10.ebuild:
+  New version and minor fix, amd64 requires an updated patch.
+
+  07 Apr 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.10.19.ebuild:
+  opengl useflag added
+
+  21 Mar 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.10.19.ebuild:
+  Marked x86
+
+  18 Mar 2005; Luca Barbato <lu_zero@gentoo.org>
+  -files/fglrx-3.2.8-fix-amd-adv-spec.patch,
+  -files/fglrx-3.9.0-allocation.patch, -files/fglrx-3.9.0-regparm.patch,
+  -ati-drivers-3.9.0.ebuild, -ati-drivers-3.9.0-r1.ebuild,
+  -ati-drivers-3.11.1.ebuild, -ati-drivers-3.12.0.ebuild,
+  -ati-drivers-3.14.1.ebuild, -ati-drivers-3.14.6.ebuild:
+  Cleanup
+
+  24 Feb 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.10.19.ebuild:
+  Minor fix, thanks to Karl Tomlinson <tomlinso+gentoo@esu1.auckland.ac.nz>
+
+  18 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/fglrx-2.6-pagetable.patch:
+  Another typo fixed, thanks to Mark S <mszilveszter@gmail.com> for reporting it
+
+  17 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  files/fglrx-2.6-pagetable.patch:
+  Fix a typo on the pagetable patch, thanks to Marcelo Penna Guerra
+  <eu@marcelopenna.org> for pointing out
+
+*ati-drivers-8.10.19 (16 Feb 2005)
+
+  16 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.10.19.ebuild:
+  New version
+
+  06 Feb 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  Marked x86
+
+  05 Feb 2005; Dylan Carlson <absinthe@gentoo.org>
+  +files/fglrx-2.6-pagetable.patch, ati-drivers-8.8.25-r3.ebuild:
+  4-level page table patch for 2.6.11 kernels (should be ok with =< 2.6.10 too).
+
+  01 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/8.8.25-via-amd64.patch, ati-drivers-8.8.25-r3.ebuild,
+  ati-drivers-8.8.25.ebuild:
+  Minor changes
+
+*ati-drivers-8.8.25 (01 Feb 2005)
+
+  01 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.8.25-r3.ebuild, +ati-drivers-8.8.25.ebuild:
+  Added back an x86 only ebuild, made the custom header install in the X11_DIR
+  instead of /usr/X11R6
+
+  27 Jan 2005; Luca Barbato <lu_zero@gentoo.org> :
+  Fix for bug #78870
+
+  24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ati-drivers-8.8.25-r3.ebuild:
+  Adding >=x11-base/opengl-update-2.1_pre1 as an RDEPEND for MesaGL relatedness.
+
+*ati-drivers-8.8.25-r3 (24 Jan 2005)
+
+  24 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ati-drivers-8.8.25-r1.ebuild, -ati-drivers-8.8.25-r2.ebuild,
+  +ati-drivers-8.8.25-r3.ebuild, -ati-drivers-8.8.25.ebuild:
+  Don't install libMesaGL (bug #47598).  Set proper libdir in .la.
+
+*ati-drivers-8.8.25-r2 (23 Jan 2005)
+
+  23 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.8.25-r2.ebuild:
+  Fixed the libGL.la, solves bug #78937
+
+  21 Jan 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.8.25-r1.ebuild:
+  Added back the libGL.la symlink
+
+*ati-drivers-8.8.25-r1 (20 Jan 2005)
+
+  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +ati-drivers-8.8.25-r1.ebuild:
+  Multilib cleanups.
+
+  19 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  typo in the multilib support section, fixed thanks Robert Führicht
+  <the_master_of_disaster@gmx.at>
+
+  19 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  Revert back the include symlink removal
+
+  19 Jan 2005; Luca Barbato <lu_zero@gentoo.org> :
+  fixed amd64 digests
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  Added support for amd64, multilib support should work, converted to the
+  linux-mod eclass.
+
+  18 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.8.25.ebuild:
+  minor change
+
+  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:
+  Adding the official patch
+
+  27 Dec 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.6.ebuild:
+  Marked x86
+
+  12 Nov 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.6.ebuild:
+  Marked ~x86
+
+*ati-drivers-3.14.6 (11 Nov 2004)
+
+  11 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6.10-pci_get_class.patch, +ati-drivers-3.14.6.ebuild:
+  New version, linux-2.6.10-rc1 partial support added
+
+  08 Oct 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.1.ebuild:
+  Marked stable
+
+  02 Oct 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.14.1.ebuild:
+  Cleanup + remove a stray patch
+
+*ati-drivers-3.14.1 (02 Oct 2004)
+
+  02 Oct 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.14.1.ebuild:
+  New version, it still doesn't work with the latest xorg
+
+  24 Sep 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.12.0.ebuild:
+  Minor fix
+
+  23 Sep 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.12.0.ebuild:
+  Pinning the deps, should be a better way to handle the issue
+
+*ati-drivers-3.12.0 (11 Sep 2004)
+
+  11 Sep 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.11.1.ebuild,
+  +ati-drivers-3.12.0.ebuild:
+  New version and added a check for xorg.
+
+  30 Aug 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.11.1.ebuild:
+  Minor cleanup
+
+*ati-drivers-3.11.1 (09 Aug 2004)
+
+  09 Aug 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.11.1.ebuild:
+  New version
+
+  26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-2.9.13-r1.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, ati-drivers-3.9.0-r1.ebuild,
+  ati-drivers-3.9.0.ebuild:
+  /usr/src/linux needs ${ROOT}.
+
+  19 Jun 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.9.0-r1.ebuild:
+  Marked stable
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> 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,
+  ati-drivers-3.9.0.ebuild:
+  Fix use invocation
+
+  03 Jun 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.9.0-r1.ebuild:
+  Reverted the memory allocation patch, added some instructions how to solve
+  that, thanks again Aric Cyr <acyr76@yahoo.ca> for the notice.
+
+*ati-drivers-3.9.0-r1 (02 Jun 2004)
+
+  02 Jun 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-3.9.0-allocation.patch, +files/fglrx-3.9.0-regparm.patch,
+  +ati-drivers-3.9.0-r1.ebuild:
+  Various patches to solve different issues, thanks to Tarmo Tanav
+  <sn4ip3r@estprog.ee> for the regparm patch and Aric Cyr <acyr76@yahoo.ca> for
+  the memory allocation fix.
+
+*ati-drivers-3.2.8-r2 (28 May 2004)
+
+  28 May 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.2.8-r2.ebuild:
+  Backport from 3.9.0, thanks to Edward Kaplan <theymight.begiants@verizon.net>
+  for asking it and posting an ebuild.
+
+*ati-drivers-3.9.0 (27 May 2004)
+
+  27 May 2004; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-3.9.0.ebuild:
+  New version
+
+  27 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/fglrx-2.6-get-page.patch, ati-drivers-3.7.6-r1.ebuild:
+  Fix for 2.6.7 kernel
+
+  02 May 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-3.7.6-r1.ebuild:
+  Remove needless call to portageq.
+
+  25 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-3.7.6-r1.ebuild:
+  Provide virtual/opengl (#30107).
+
+  09 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-3.7.6-r1.ebuild:
+  Fix X11_IMPLEM. Fix from merkaba@quantumfish.com (#47282).
+
+*ati-drivers-3.7.6-r1 (08 Apr 2004)
+
+  08 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-3.7.6-r1.ebuild:
+  Update for xorg-x11 compatibility.
+
+  01 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  ati-drivers-2.5.1-r1.ebuild, ati-drivers-2.5.1.ebuild, files/ati-2.5.1.diff:
+  These only work with xfree 4.2 or lower. Since that's not around anymore,
+  these shouldn't be either. Reported by Michael Sterrett
+  <mr_bones_@gentoo.org>.
+
+  11 Mar 2004; Luca Barbato <lu_zero@gentoo.org> :
+  Fixed executable perms
+
+*ati-drivers-3.7.6 (10 Mar 2004)
+
+  10 Mar 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.7.6.ebuild:
+  New version, nwn players beware
+
+*ati-drivers-3.2.8-r1 (24 Feb 2004)
+
+  24 Feb 2004; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.8-r1.ebuild:
+  driver only ebuild, optional stuff in ati-drivers-extra
+
+  30 Dec 2003; Martin Schlemmer <azarah@gentoo.org> ati-drivers-3.7.0.ebuild:
+  Fix path to ATI control panel in .desktop files.
+
+*ati-drivers-3.7.0 (30 Dec 2003)
+
+  30 Dec 2003; Martin Schlemmer <azarah@gentoo.org> ati-drivers-3.7.0.ebuild,
+  files/fglrx-3.7.0-fix-fglrx_panel-includes.patch:
+  Update version.  This closes bug #36743, with thanks for ebuild and patch
+  to Alex Plank <aplank@notsohotmail.com>.  Further did a major overhaul of
+  the ebuild - lots of cleanups and form fixes.
+
+  28 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.8.ebuild:
+  Marked x86.
+
+  12 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.8.ebuild:
+  Small fix: bug #30975, thanks to Wedge_ <wedge__@fastmail.fm> for the
+  suggestion
+
+*ati-drivers-3.2.8 (08 Oct 2003)
+
+  08 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.8.ebuild:
+  New version
+
+  07 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5-r1.ebuild,
+  ati-drivers-3.2.5-r1.ebuild:
+  Removed a patch not required anymore for the latest mm sources.
+
+  02 Oct 2003; Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5-r1.ebuild,
+  ati-drivers-3.2.5.ebuild:
+  Make direct use of the provided Makefile
+
+*ati-drivers-3.2.5-r1 (30 Sep 2003)
+
+  30 Sep 2003; Brandon Low <lostlogic@gentoo.org> ati-drivers-3.2.5-r1.ebuild:
+  Add support for most recent -mm kernels (1 line patch) and make ebuild a bit
+  neater
+
+  08 Sep 2003 Luca Barbato <lu_zero@gentoo.org> :
+  Removed old 2.9.8 and 2.9.6 ebuilds
+
+*ati-drivers-3.2.5 (05 Sep 2003)
+  
+  05 Sep 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5.ebuild:
+  Some typos fixed
+  
+  05 Sep 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.5.ebuild:
+  New Version
+  
+  05 Sep 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.4.ebuild,
+  files/fglrx-2.6-vmalloc-vmaddr.patch:
+  Added a workaround for mm-sources, cleaned a bit the ebuild.
+  thanks to wedge_ for the patch, solves bug #27912
+
+*ati-drivers-3.2.4 (12 Aug 2003)
+
+*ati-drivers-3.2.0 (12 Aug 2003)
+
+  12 Aug 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-3.2.0.ebuild,
+  ati-drivers-3.2.4.ebuild, files/fglrx-2.6-amd-adv-spec-fix.patch,
+  files/fglrx-2.6-fix-deprecated.patch, files/fglrx-2.6-makefile.patch:
+  New versions, thanks to Wedge_ for the work.
+
+  22 Jul 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.13-r1.ebuild,
+  ChangeLog: Added experimental support for 2.6 kernels.
+
+*ati-drivers-2.9.13 (03 Jul 2003)
+  
+  03 Jul 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.13.ebuild,
+  ChangeLog: Version bump, support for later board.
+
+*ati-drivers-2.9.12 (19 May 2003)
+  
+  19 May 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.12.ebuild,
+  ChangeLog: Updated, thanks to Koen Geeraerts <ir007252@worldonline.be>
+  for the notice.
+
+  11 May 2003; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-2.5.1-r1.ebuild, ati-2.5.1.diff: Added a patch to solve 
+  bug #20104, backported drobbins' tweaks.
+   
+  01 May 2003; Daniel Robbins <drobbins@gentoo.org>
+  ati-drivers-2.9.8.ebuild: Tweaked compile process to work even with NVIDIA
+  headers (defined USE_GLU,) moved unpack stuff to src_unpack, and removed
+  automatic calls to "opengl-update" (messed up gamecd.) Also unmasking for
+  x86. And no longer installs app sources. And now auto-downloads and unpacks
+  everthing. And dep fixes :)
+
+*ati-drivers-2.9.8 (26 Apr 2003)
+  
+  26 Feb 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.8.ebuild,
+  ChangeLog: New update, should had support to the 9800 serie.
+
+  23 Apr 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.6.ebuild,
+  ati-drivers-2.5.1-r1,ChangeLog : Fix some stuff
+
+*ati-drivers-2.9.6 (3 Apr 2003)
+  3 Apr 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.9.6.ebuild,
+    ChangeLog :
+    As requested I update the ebuild, I do not suggest the use of those
+    drivers
+
+  1 Mar 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.5.1-r1.ebuild,
+    ChangeLog:
+    make sure that the opengl is set to xfree while compiling and after 
+    unmerge.
+
+*ati-drivers-2.5.1-r1 (3 Feb 2003)
+  3 Feb 2003 Luca Barbato <lu_zero@gentoo.org> ati-drivers-2.5.1-r1.ebuild,
+    ChangeLog, files/digest-ati-drivers-2.5.1-r1:
+    add the xfree dependency to avoid the xfree 4.2.99 incompatibility.
+    removed the previous ebuild.
+
+*ati-drivers-2.5.1 (26 Dec 2002)
+  
+  26 Dec 2002;Brad Cowan <bcowan@gentoo.org> ati-drivers-2.5.1.ebuild,
+    ChangeLog, files/digest-ati-drivers-2.5.1: Initial import.
+   
+  29 Nov 2002; Luca Barbato <lu_zero@psxfanatics.com> ati-drivers-2.5.1.ebuild,
+  ChangeLog, files/digest-ati-drivers-2.5.1:
+  Initial ebuild for the ati precompiled drivers.
+  The idea of using cpio is from the icc ebuilds, the rest is from the nvidia-*
+  ebuilds.
+
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
new file mode 100644
index 000000000000..078474afdda8
--- /dev/null
+++ b/x11-drivers/ati-drivers/Manifest
@@ -0,0 +1,32 @@
+MD5 3d37cc1ba0ff95564e3da181e3f1eed8 ati-drivers-8.18.6-r1.ebuild 7910
+MD5 a96355b7f8818179863b85c69bf584c3 ati-drivers-8.14.13-r3.ebuild 7675
+MD5 2e5825fd6b2b03eb70a10b920f7eb3e3 ati-drivers-8.18.6.ebuild 7086
+MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
+MD5 62c92bb51d8753565542d8ab3167f664 ati-drivers-8.18.8.ebuild 7857
+MD5 b0e07b107756bc3303e04b578b67d9a1 ati-drivers-8.14.13-r2.ebuild 6687
+MD5 198f9610851d335d62acc0f2e6c99142 ati-drivers-8.18.8-r1.ebuild 8176
+MD5 9f31103cb72e7f3a236941fa70891c5a ati-drivers-8.16.20-r1.ebuild 6512
+MD5 2e1be14c39b4c9fd43e3f87b580e5302 ati-drivers-8.14.13-r5.ebuild 7781
+MD5 a37cb5612ebeb94a8e4fa889c88c7c9e ati-drivers-8.14.13-r4.ebuild 7495
+MD5 9b7b0186c42e7d226c4b53560a50e4ec ChangeLog 22252
+MD5 142444f733b464a3c075fac4415aef50 ati-drivers-8.16.20.ebuild 6227
+MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158
+MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20-r1 158
+MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
+MD5 2e151bc6c93225be53fd1a68d36ee877 files/fglrx-2.6.14-compat_ioctl.patch 3227
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r5 157
+MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8-r1 168
+MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
+MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8 168
+MD5 27685e5b509889cb606108eec627aaac files/fglrx-2.6.14-access_ok.patch 521
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
+MD5 3f9c6083c83f1c87c4b860ef4eca55f6 files/digest-ati-drivers-8.18.6-r1 168
+MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
+MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
+MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
+MD5 3e29001f6bcfcec91a4802e6c6e37fc1 files/digest-ati-drivers-8.18.6 156
+MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild
new file mode 100644
index 000000000000..96f71d278fe2
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r2.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="-* amd64 x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 >=x11-base/opengl-update-2.1_pre1
+	 || ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	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
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+	if kernel_is 2 6
+	then
+		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
+		epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
+		epatch ${FILESDIR}/fglrx-8.14.13-alt-2.6.12-agp.patch
+	fi
+	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+	epatch ${FILESDIR}/8.8.25-smp.patch
+	epatch ${FILESDIR}/ioctl32.patch
+	epatch ${FILESDIR}/p1.patch
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+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_FULL}/video
+	# set_kvobj
+	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -pPR ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+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\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	update-modules
+}
+
+pkg_postrm() {
+	opengl-update --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild
new file mode 100644
index 000000000000..f9e94e0eb65d
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r3.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl dlloader"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="-* amd64 x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 >=x11-base/opengl-update-2.1_pre1
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/lib/modules/fglrx/build_mod)"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	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
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+	if kernel_is 2 6
+	then
+		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
+		epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
+		epatch ${FILESDIR}/fglrx-8.14.13-alt-2.6.12-agp.patch
+	fi
+	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+	epatch ${FILESDIR}/8.8.25-smp.patch
+	epatch ${FILESDIR}/ioctl32.patch
+	epatch ${FILESDIR}/p1.patch
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+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}/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	else
+		einfo "Adapting fglrx_drv to dlloader..."
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so \
+					   ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o \
+					   -Xlinker -L/usr/lib/modules -Xlinker -R/usr/lib/modules \
+					   -Xlinker -L/usr/lib/modules/linux -Xlinker -R/usr/lib/modules/linux \
+					   -Xlinker -L/usr/lib/modules/extensions -Xlinker -R/usr/lib/modules/extensions \
+					   -lfbdevhw -lglx -lfglrxdrm -ldrm -lxaa -lramdac -ldri -lfb -lint10 -lvgahw -li2c -lddc -lvbe
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	else
+		einfo "Adapting libfglrxdrm to dlloader..."
+		ar x ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so \
+			module.o FireGLdrm.o
+		rm module.o FireGLdrm.o
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	fi
+	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+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\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	opengl-update --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild
new file mode 100644
index 000000000000..bc872e7f4847
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r4.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl dlloader"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	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
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+	if kernel_is 2 6
+	then
+		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
+		epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
+		epatch ${FILESDIR}/fglrx-8.14.13-alt-2.6.12-agp.patch
+	fi
+	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+	epatch ${FILESDIR}/8.8.25-smp.patch
+	epatch ${FILESDIR}/ioctl32.patch
+	epatch ${FILESDIR}/p1.patch
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+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_FULL}/video
+	# set_kvobj
+	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	else
+		einfo "Adapting fglrx_drv to dlloader..."
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so \
+					   ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o \
+					   -Xlinker -L/usr/lib/modules -Xlinker -R/usr/lib/modules \
+					   -Xlinker -L/usr/lib/modules/linux -Xlinker -R/usr/lib/modules/linux \
+					   -Xlinker -L/usr/lib/modules/extensions -Xlinker -R/usr/lib/modules/extensions \
+					   -lfbdevhw -lglx -lfglrxdrm -ldrm -lxaa -lramdac -ldri -lfb -lint10 -lvgahw -li2c -lddc -lvbe
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	else
+		einfo "Adapting libfglrxdrm to dlloader..."
+		ar x ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so \
+			module.o FireGLdrm.o
+		rm module.o FireGLdrm.o
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	fi
+	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	update-modules
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild
new file mode 100644
index 000000000000..0d8ba1ee89e8
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.14.13-r5.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl dlloader"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/lib/modules/fglrx/build_mod)"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	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
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+	if kernel_is 2 6
+	then
+		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
+		epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
+		epatch ${FILESDIR}/fglrx-8.14.13-alt-2.6.12-agp.patch
+	fi
+	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+	epatch ${FILESDIR}/8.8.25-smp.patch
+	epatch ${FILESDIR}/ioctl32.patch
+	epatch ${FILESDIR}/p1.patch
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+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}/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	else
+		einfo "Adapting fglrx_drv to dlloader..."
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so \
+					   ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o \
+					   -Xlinker -L/usr/lib/modules -Xlinker -R/usr/lib/modules \
+					   -Xlinker -L/usr/lib/modules/linux -Xlinker -R/usr/lib/modules/linux \
+					   -Xlinker -L/usr/lib/modules/extensions -Xlinker -R/usr/lib/modules/extensions \
+					   -lfbdevhw -lglx -lfglrxdrm -ldrm -lxaa -lramdac -ldri -lfb -lint10 -lvgahw -li2c -lddc -lvbe
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	else
+		einfo "Adapting libfglrxdrm to dlloader..."
+		ar x ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so \
+			module.o FireGLdrm.o
+		rm module.o FireGLdrm.o
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	fi
+	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild
new file mode 100644
index 000000000000..38e1971c3a43
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.16.20-r1.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="-*" #~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	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
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+#	if kernel_is 2 6
+#	then
+#	fi
+	epatch ${FILESDIR}/ioctl32.patch
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+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}/lib/modules/fglrx/build_mod
+	MODULE_NAMES="fglrx(video::${WORKDIR}/lib/modules/fglrx/build_mod)"
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -pPR ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.16.20.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.16.20.ebuild
new file mode 100644
index 000000000000..38fd4834bd66
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.16.20.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.16.20.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="-*" #~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	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
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+#	if kernel_is 2 6
+#	then
+#	fi
+	epatch ${FILESDIR}/ioctl32.patch
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+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_FULL}/video
+	# set_kvobj
+	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -pPR ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	update-modules
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild
new file mode 100644
index 000000000000..40a8bcba13aa
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.6-r1.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+
+choose_driver_folder() {
+	BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+
+	# Determine if we are facing X.org 6.8.99 aka 6.9
+	if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+	   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+	   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+	then
+		BASE_NAME="${BASE_NAME}90"
+	else
+		BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+	fi
+
+	if use amd64 ; then
+		BASE_NAME="${BASE_NAME}_64a"
+	fi
+}
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+	local agp
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+
+		ebegin "Checking for PCI Express support enabled"
+		linux_chkconfig_present PCIEPORTBUS
+		eend $?
+
+		if [[ $? -ne 0 ]] ; then
+			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+			ewarn "could work only using the internal support."
+		fi
+
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_builtin DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled builtin, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-}"
+	X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+	choose_driver_folder
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	rm -rf ${BASE_NAME}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+	rm -rf ${BASE_NAME}/usr/X11R6/bin/{aticonfig,fglrx_pplay}
+
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+
+	if kernel_is 2 6
+	then
+		sed -i -e "s:verify_area:access_ok:g" \
+			drm_os_linux.h firegl_public.c firegl_public.h
+	fi
+}
+
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	ln -s ${BASE_NAME}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
+
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || ewarn "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dynamic 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}/common/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe ${BASE_NAME}/usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/common/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	# In X.org 6.8.99 / 6.9 this is a .so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	# In X.org 6.8.99 / 6.9 this is a .so
+	if has_version ">=x11-base/xorg-x11-6.8.99"
+	then
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	else
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	fi
+	cp -pPR ${BASE_NAME}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${BASE_NAME}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	dodir /etc
+	cp -pPR ${BASE_NAME}/etc/* ${D}/etc/
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.6.ebuild
new file mode 100644
index 000000000000..030511ba296b
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.6.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.6.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="x86? ( mirror://gentoo/fglrx_6_8_0-${PV}-1.i386.rpm )
+	 amd64? ( mirror://gentoo/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
+
+LICENSE="ATI"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/lib/modules/fglrx/build_mod)"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+	local agp
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+
+		ebegin "Checking for PCI Express support enabled"
+		linux_chkconfig_present PCIEPORTBUS
+		eend $?
+
+		if [[ $? -ne 0 ]] ; then
+		ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+		ewarn "will not work."
+	fi
+
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_builtin DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled builtin, the direct rendering"
+	ewarn "will not work."
+	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 kernel_is 2 6
+	then
+		sed -i -e "s:verify_area:access_ok:g" \
+			drm_os_linux.h firegl_public.c firegl_public.h
+#		epatch ${FILESDIR}/fglrx-2.6.12-pci_name.patch
+#		epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
+	fi
+#	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+#	epatch ${FILESDIR}/8.8.25-smp.patch
+#	epatch ${FILESDIR}/8.14.13-amd64.patch
+	rm -rf ${WORKDIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+	rm -rf ${WORKDIR}/usr/X11R6/bin/{aticonfig,fglrx_pplay}
+
+}
+
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || ewarn "DRM module not built"
+	fi
+}
+
+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}/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+	# DRM module
+	# insinto /lib/modules/${KV_FULL}/video
+	# set_kvobj
+	# doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+	cd ${WORKDIR}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -pPR ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild
new file mode 100644
index 000000000000..85672ed0b214
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.8-r1.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+
+choose_driver_folder() {
+	#new modular X paths, 0 is a workaround.
+	if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 7 ] \
+		|| [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 0 ]
+	then
+		BASE_NAME="${WORKDIR}/x690"
+		xlibdir="xorg"
+	else
+		BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+		xlibdir=""
+
+		# Determine if we are facing X.org 6.8.99 aka 6.9
+		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+		then
+			BASE_NAME="${BASE_NAME}90"
+		else
+			BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+		fi
+	fi
+
+	if use amd64 ; then
+		BASE_NAME="${BASE_NAME}_64a"
+	fi
+}
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+	local agp
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+
+		ebegin "Checking for PCI Express support enabled"
+		linux_chkconfig_present PCIEPORTBUS
+		eend $?
+
+		if [[ $? -ne 0 ]] ; then
+			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+			ewarn "could work only using the internal support."
+		fi
+
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_builtin DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled builtin, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
+	X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+	choose_driver_folder
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	rm -rf ${BASE_NAME}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+
+	if kernel_is 2 6
+	then
+		epatch "${FILESDIR}/fglrx-2.6.14-access_ok.patch"
+
+		if use amd64
+		then
+		epatch "${FILESDIR}/fglrx-2.6.14-compat_ioctl.patch"
+		fi
+	fi
+}
+
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	ln -s ${BASE_NAME}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
+
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || ewarn "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dynamic 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}/common/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe ${BASE_NAME}/usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/common/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir="$(get_libdir)/$xlibdir"
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	# In X.org 6.8.99 / 6.9 this is a .so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	# In X.org 6.8.99 / 6.9 this is a .so
+	if has_version ">=x11-base/xorg-x11-6.8.99"
+	then
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	else
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	fi
+	cp -pPR ${BASE_NAME}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${BASE_NAME}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	dodir /etc
+	cp -pPR ${BASE_NAME}/etc/* ${D}/etc/
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
+	einfo "To change your XF86Config you can use the bundled \"aticonfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.8.ebuild
new file mode 100644
index 000000000000..af62655a6fdc
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.8.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.8.ebuild,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+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"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+
+choose_driver_folder() {
+	BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+
+	# Determine if we are facing X.org 6.8.99 aka 6.9
+	if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+	   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+	   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+	then
+		BASE_NAME="${BASE_NAME}90"
+	else
+		BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+	fi
+
+	if use amd64 ; then
+		BASE_NAME="${BASE_NAME}_64a"
+	fi
+}
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+	local agp
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+
+	if [[ $? -ne 0 ]] ; then
+
+		ebegin "Checking for PCI Express support enabled"
+		linux_chkconfig_present PCIEPORTBUS
+		eend $?
+
+		if [[ $? -ne 0 ]] ; then
+			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+			ewarn "could work only using the internal support."
+		fi
+
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_builtin DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled builtin, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-}"
+	X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+	choose_driver_folder
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	rm -rf ${BASE_NAME}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+
+	if kernel_is 2 6
+	then
+		sed -i -e "s:verify_area:access_ok:g" \
+			drm_os_linux.h firegl_public.c firegl_public.h
+	fi
+}
+
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	ln -s ${BASE_NAME}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
+
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	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_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || ewarn "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dynamic 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}/common/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	local native_dir
+	use x86 && native_dir="lib"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	exeinto /opt/ati/bin
+	doexe ${BASE_NAME}/usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/common/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/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
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround
+	if use opengl ; then
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+	fi
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	# In X.org 6.8.99 / 6.9 this is a .so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	# In X.org 6.8.99 / 6.9 this is a .so
+	if has_version ">=x11-base/xorg-x11-6.8.99"
+	then
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	else
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	fi
+	cp -pPR ${BASE_NAME}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${BASE_NAME}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	dodir /etc
+	cp -pPR ${BASE_NAME}/etc/* ${D}/etc/
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
+	einfo "To change your XF86Config you can use the bundled \"aticonfig\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/files/09ati b/x11-drivers/ati-drivers/files/09ati
new file mode 100644
index 000000000000..4b0639956072
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/09ati
@@ -0,0 +1,2 @@
+PATH=/opt/ati/bin
+ROOTPATH=/opt/ati/bin
\ No newline at end of file
diff --git a/x11-drivers/ati-drivers/files/8.8.25-smp.patch b/x11-drivers/ati-drivers/files/8.8.25-smp.patch
new file mode 100644
index 000000000000..9914a8d9fde0
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.8.25-smp.patch
@@ -0,0 +1,12 @@
+--- firegl_public.c.bak	2004-12-10 11:35:14.091477807 +0100
++++ firegl_public.c	2004-12-10 11:07:12.000000000 +0100
+@@ -32,6 +32,9 @@
+ // ============================================================
+ #include <linux/version.h>
+ #include <linux/autoconf.h>
++#ifdef CONFIG_SMP
++#define __SMP__
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,71)
+ #define EXPORT_SYMTAB	1
diff --git a/x11-drivers/ati-drivers/files/8.8.25-via-amd64.patch b/x11-drivers/ati-drivers/files/8.8.25-via-amd64.patch
new file mode 100644
index 000000000000..78473847404d
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/8.8.25-via-amd64.patch
@@ -0,0 +1,37 @@
+--- agpgart_be.c 2005-01-18 15:02:14.639429632 +0100
++++ agpgart_be.c        2005-01-18 14:54:34.000000000 +0100
+@@ -6167,6 +6167,22 @@
+         "Via",
+         "Apollo P4M266",
+         via_generic_setup },
++
++ { PCI_DEVICE_ID_VIA_8380_0,
++                PCI_VENDOR_ID_VIA,
++                AMD_8151,
++                "AMD",
++                "On-CPU GART",
++                amd_8151_setup },
++
++        { PCI_DEVICE_ID_VIA_8385_0,
++                PCI_VENDOR_ID_VIA,
++                AMD_8151,
++                "AMD",
++                "On-CPU GART",
++                amd_8151_setup },
++
++
+     { 0,
+         PCI_VENDOR_ID_VIA,
+         VIA_GENERIC,
+--- agp.h       2005-01-18 15:02:14.644428872 +0100
++++ agp.h       2005-01-18 14:55:33.000000000 +0100
+@@ -202,6 +202,9 @@
+     #define SIS_GENERIC             _X(SIS_GENERIC)
+     #define AMD_GENERIC             _X(AMD_GENERIC)
+     #define AMD_IRONGATE            _X(AMD_IRONGATE)
++    #define PCI_DEVICE_ID_VIA_8380_0        0x0204
++    #define PCI_DEVICE_ID_VIA_8385_0        0x3188
++
+ //    #define AMD_IGD4                _X(AMD_IGD4)
+ //    #define AMD_IGD4_2P             _X(AMD_IGD4_2P)
+     #define AMD_761                 _X(AMD_761) 
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r2 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r2
new file mode 100644
index 000000000000..5c1bc0c5f191
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r2
@@ -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-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r3 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r3
new file mode 100644
index 000000000000..5c1bc0c5f191
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r3
@@ -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-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r4 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r4
new file mode 100644
index 000000000000..5c1bc0c5f191
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r4
@@ -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-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r5 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r5
new file mode 100644
index 000000000000..5c1bc0c5f191
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.14.13-r5
@@ -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-drivers/ati-drivers/files/digest-ati-drivers-8.16.20 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.16.20
new file mode 100644
index 000000000000..1f351a19affd
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-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-drivers/ati-drivers/files/digest-ati-drivers-8.16.20-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.16.20-r1
new file mode 100644
index 000000000000..1f351a19affd
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.16.20-r1
@@ -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-drivers/ati-drivers/files/digest-ati-drivers-8.18.6 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.6
new file mode 100644
index 000000000000..b9a1b3a7e463
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-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-drivers/ati-drivers/files/digest-ati-drivers-8.18.6-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.6-r1
new file mode 100644
index 000000000000..c59c131d4be8
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.6-r1
@@ -0,0 +1,2 @@
+MD5 fbe9d229241a496bd6b4786b17a6cb5f ati-driver-installer-8.18.6-i386.run 62368301
+MD5 b1ab61da644117028b1d911ac20ba709 ati-driver-installer-8.18.6-x86_64.run 53491900
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.8 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.8
new file mode 100644
index 000000000000..3b61133f0845
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-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-drivers/ati-drivers/files/digest-ati-drivers-8.18.8-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.8-r1
new file mode 100644
index 000000000000..3b61133f0845
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.8-r1
@@ -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-drivers/ati-drivers/files/fglrx-2.6.12-inter_module_get.patch b/x11-drivers/ati-drivers/files/fglrx-2.6.12-inter_module_get.patch
new file mode 100644
index 000000000000..47433de8fae7
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/fglrx-2.6.12-inter_module_get.patch
@@ -0,0 +1,23 @@
+--- build_mod.orig/firegl_public.c	2005-06-19 21:37:23.000000000 +0200
++++ build_mod/firegl_public.c	2005-06-19 21:22:49.000000000 +0200
+@@ -343,17 +343,17 @@
+ struct firegl_drm_stub_info_t *firegl_stub_pointer = NULL;
+ #define inter_module_put(x)
+ #define inter_module_unregister(x)
+-#define inter_module_get(x)             firegl_stub_pointer
++#define inter_module_get_request(x,y)             firegl_stub_pointer
+ #define inter_module_register(x,y,z)    do { firegl_stub_pointer = z; } while (0)
+ /* This is a kludge for backward compatibility that is only useful in DRM(stub_open) */
+ #define fops_put(fops)      MOD_DEC_USE_COUNT
+ #define fops_get(fops)      (fops); MOD_INC_USE_COUNT
+ #endif // LINUX_VERSION_CODE < 0x020400
+ 
+-#define DRM_MODULE_GET          (firegl_drm_stub_info_t *)inter_module_get("drm")
++#define DRM_MODULE_GET          (firegl_drm_stub_info_t *)inter_module_get_request("drm", "drm")
+ #define DRM_MODULE_PUT          inter_module_put("drm")
+ 
+-#define DRM_AGP_MODULE_GET      (drm_agp_t *)inter_module_get("drm_agp")
++#define DRM_AGP_MODULE_GET      (drm_agp_t *)inter_module_get_request("drm_agp","drm_agp")
+ #define DRM_AGP_MODULE_PUT      inter_module_put("drm_agp")
+ 
+ unsigned long ATI_API_CALL __ke_cpu_to_le32(unsigned long _u)
diff --git a/x11-drivers/ati-drivers/files/fglrx-2.6.12-pci_name.patch b/x11-drivers/ati-drivers/files/fglrx-2.6.12-pci_name.patch
new file mode 100644
index 000000000000..03197a9748cb
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/fglrx-2.6.12-pci_name.patch
@@ -0,0 +1,71 @@
+--- build_mod.orig/agpgart_be.c	2005-06-19 15:59:55.000000000 +0200
++++ build_mod/agpgart_be.c	2005-06-19 15:58:59.000000000 +0200
+ #if (LINUX_VERSION_CODE >= 0x020400)
+ #define FGL_PM_PRESENT
+ #else
+@@ -7083,7 +7087,7 @@
+ 			if ( agp_bridge.capndx )
+             {
+ 				printk(KERN_INFO PFX "Detected HP ZX1 AGP "
+-				       "chipset at %s\n", dev->slot_name);
++				       "chipset at %s\n", pci_name(dev));
+ 				agp_bridge.type = HP_ZX1;
+ 				agp_bridge.dev = dev;
+               	/* fill in the mode register */
+@@ -7149,7 +7153,7 @@
+                 if( cap_ptr )
+                 {
+     				printk(KERN_INFO PFX "Detected a Via Apollo KT400 chipset in AGP v3 mode "
+-	    			       "at %s\n", dev->slot_name);
++	    			       "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_KT400;
+     				agp_bridge.dev = dev;
+@@ -7169,12 +7173,12 @@
+                 if( cap_ptr )
+                 {
+     				printk(KERN_DEBUG PFX "Detected a Via Apollo KT400 chipset in AGP v2 compat mode "
+-	    			       "at %s\n", dev->slot_name);
++	    			       "at %s\n", pci_name(dev));
+                 }
+                 else
+                 {
+     				printk(KERN_ERR PFX "Detected a Via Apollo KT400 chipset but no AGPv2/v3 caps found "
+-	    			       "at %s\n", dev->slot_name);
++	    			       "at %s\n", pci_name(dev));
+                 }
+             }
+             break;
+@@ -7200,7 +7204,7 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_INFO PFX "Detected a Via P4X400 chipset in AGP v3 mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_P4X400;
+                     agp_bridge.dev = dev;
+@@ -7220,7 +7224,7 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_INFO PFX "Detected a Via P4X400 chipset with AGP v3.x caps in AGP v2 compatibility mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+ 
+                     agp_bridge.type = VIA_APOLLO_P4X400;
+                     agp_bridge.dev = dev;
+@@ -7240,12 +7244,12 @@
+                 if( cap_ptr )
+                 {
+                     printk(KERN_DEBUG PFX "Detected a Via P4X400 chipset with AGP v2 caps in true AGP v2 mode "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+                 }
+                 else
+                 {
+                     printk(KERN_ERR PFX "Detected a Via P4X400 chipset but no AGPv2/v3 caps found "
+-                           "at %s\n", dev->slot_name);
++                           "at %s\n", pci_name(dev));
+                 }
+             }
+             break;
diff --git a/x11-drivers/ati-drivers/files/fglrx-2.6.14-access_ok.patch b/x11-drivers/ati-drivers/files/fglrx-2.6.14-access_ok.patch
new file mode 100644
index 000000000000..50f1944fe05f
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/fglrx-2.6.14-access_ok.patch
@@ -0,0 +1,16 @@
+--- build_mod.orig/firegl_public.c	2005-10-22 10:35:00.000000000 +0200
++++ build_mod/firegl_public.c	2005-10-29 11:13:21.000000000 +0200
+
+@@ -1590,7 +1595,11 @@
+ 
+ int ATI_API_CALL __ke_verify_area(int type, const void * addr, unsigned long size)
+ {
+-    return verify_area(type, addr, size);
++#ifdef access_ok
++   return access_ok(type,addr,size) ? 0 : -EFAULT;
++#else
++   return verify_area(type, addr, size);
++#endif 
+ }
+ 
+ int ATI_API_CALL __ke_get_pci_device_info(__ke_pci_dev_t* dev, __ke_pci_device_info_t *pinfo)
diff --git a/x11-drivers/ati-drivers/files/fglrx-2.6.14-compat_ioctl.patch b/x11-drivers/ati-drivers/files/fglrx-2.6.14-compat_ioctl.patch
new file mode 100644
index 000000000000..b333b5b5dff3
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/fglrx-2.6.14-compat_ioctl.patch
@@ -0,0 +1,104 @@
+--- build_mod.orig/firegl_public.c	2005-11-02 20:29:43.535048712 -0800
++++ build_mod/firegl_public.c	2005-11-02 20:27:19.013019400 -0800
+@@ -122,7 +122,6 @@
+ 
+ #ifdef __x86_64__
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+-#include "linux/ioctl32.h"
+ #else
+ #include "asm/ioctl32.h"
+ #endif
+@@ -191,6 +190,16 @@ _syscall3( int, modify_ldt, int, func, v
+ // ============================================================
+ /* globals */
+ 
++int register_ioctl32_conversion(unsigned int cmd, int (*handler)(unsigned int, unsigned int, unsigned long, struct file*));
++long realHandler_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
++void unregister_ioctl32_conversion(unsigned int cmd);
++struct HandlerList {
++       unsigned int cmd;
++       void *handler;
++       struct HandlerList *next;
++};
++struct HandlerList *HandlerListHead = 0x0;
++
+ char* firegl = NULL;
+ int __ke_debuglevel = 0;
+ int __ke_moduleflags = 0;
+@@ -258,6 +267,7 @@ static struct file_operations firegl_fop
+     open:    ip_firegl_open,
+     release: ip_firegl_release,
+     ioctl:   ip_firegl_ioctl,
++    compat_ioctl: realHandler_compat_ioctl,
+     mmap:    ip_firegl_mmap,
+ };
+ 
+@@ -2220,10 +2230,68 @@ int ATI_API_CALL __ke_register_ioctl32_c
+     return register_ioctl32_conversion(cmd, handler);
+ }
+ 
++
++ int register_ioctl32_conversion(unsigned int cmd, int (*handler)(unsigned int, unsigned int, unsigned long, struct file*))
++ {
++       sizeof(struct HandlerList);
++       struct HandlerList *newHandler = kmalloc(sizeof(struct HandlerList), 0);
++       newHandler->cmd = cmd;
++       newHandler->handler = handler;
++       newHandler->next = HandlerListHead;
++       HandlerListHead = newHandler;
++       return 0;
++ }
++ 
++ long realHandler_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
++ {     
++       int fd;
++       int (*handler)(unsigned int, unsigned int, unsigned long, struct file*);
++       struct fdtable *fdt;
++       struct HandlerList *HandlerEntry = HandlerListHead;
++ 
++       while(HandlerEntry->cmd != cmd){
++               if(HandlerEntry->next == 0x0){ 
++                       return -1;
++               }
++               HandlerEntry = HandlerEntry->next;
++       }       
++       handler = HandlerEntry->handler;
++       fdt = files_fdtable(current->files);
++       for(fd=0;fd<fdt->max_fds;fd++){
++               if(fdt->fd[fd] == filp){
++                       return handler(fd, cmd, arg, filp);
++               }
++       }
++       return -1;
++}
++
++
++
+ void ATI_API_CALL __ke_unregister_ioctl32_conversion(unsigned int cmd)
+ {
+     unregister_ioctl32_conversion(cmd);
+ }
++
++ void unregister_ioctl32_conversion(unsigned int cmd)
++ {
++       struct HandlerList *ahead, *behind;
++       if(HandlerListHead == 0x0) return;
++       behind = HandlerListHead;
++       ahead = HandlerListHead->next;
++       if(behind->cmd == cmd){
++               HandlerListHead = ahead;
++               kfree(behind);
++               return;
++       }
++       while(ahead->cmd != cmd){
++               behind = ahead;
++               ahead = ahead->next;
++       }
++       behind->next = ahead->next;
++       kfree(ahead);
++       return;
++ }
++
+ #endif
+ 
+ /* agp_memory related routine for IGP */
diff --git a/x11-drivers/ati-drivers/files/fglrx-8.14.13-alt-2.6.12-agp.patch b/x11-drivers/ati-drivers/files/fglrx-8.14.13-alt-2.6.12-agp.patch
new file mode 100644
index 000000000000..beda866414f5
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/fglrx-8.14.13-alt-2.6.12-agp.patch
@@ -0,0 +1,98 @@
+--- build_mod/firegl_public.c.alt-2.6.12-agp	2005-06-26 19:35:34 +0400
++++ build_mod/firegl_public.c	2005-06-26 19:41:28 +0400
+@@ -1002,8 +1002,16 @@ void* ATI_API_CALL __ke_high_memory(void
+     return high_memory;
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
++/* Saved pci_dev pointer for the new agpgart API */
++static struct pci_dev *fglrx_pci_dev;
++#endif
++
+ int ATI_API_CALL __ke_pci_enable_device(__ke_pci_dev_t* dev)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
++    fglrx_pci_dev = (struct pci_dev *)dev;
++#endif
+     return (pci_enable_device( (struct pci_dev*)(void *)dev ));
+ }
+ 
+@@ -2865,6 +2873,68 @@ typedef struct {
+ 	int			(*copy_info)(struct agp_kern_info *);
+ } drm_agp_t;
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
++/*
++ * Kernel 2.6.12 has new agpgart API with support for multiple AGP bridges, but
++ * the fglrx core does not know about this yet.  For now, just emulate the old
++ * API.
++ */
++
++static struct agp_bridge_data *fglrx_agp_bridge;
++
++static int fglrx_compat_agp_backend_acquire(void)
++{
++	fglrx_agp_bridge = agp_backend_acquire(fglrx_pci_dev);
++	if (!fglrx_agp_bridge)
++		return -ENODEV;
++	return 0;
++}
++
++static void fglrx_compat_agp_backend_release(void)
++{
++	agp_backend_release(fglrx_agp_bridge);
++}
++
++static struct agp_memory *fglrx_compat_agp_allocate_memory(size_t page_count,
++							   u32 type)
++{
++	return agp_allocate_memory(fglrx_agp_bridge, page_count, type);
++}
++
++static void fglrx_compat_agp_enable(u32 mode)
++{
++	agp_enable(fglrx_agp_bridge, mode);
++}
++
++static int fglrx_compat_agp_copy_info(struct agp_kern_info *info)
++{
++	if (!fglrx_agp_bridge) {
++		fglrx_agp_bridge = agp_find_bridge(fglrx_pci_dev);
++		if (!fglrx_agp_bridge) {
++			memset(info, 0, sizeof(struct agp_kern_info));
++			info->chipset = NOT_SUPPORTED;
++			return -ENODEV;
++		}
++	}
++	return agp_copy_info(fglrx_agp_bridge, info);
++}
++
++static const drm_agp_t drm_agp = {
++	&agp_free_memory,
++	&fglrx_compat_agp_allocate_memory,
++	&agp_bind_memory,
++	&agp_unbind_memory,
++	&fglrx_compat_agp_enable,
++	&fglrx_compat_agp_backend_acquire,
++	&fglrx_compat_agp_backend_release,
++	&fglrx_compat_agp_copy_info
++};
++
++#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12) */
++/*
++ * For 2.6.11 we can just use the agpgart functions directly.
++ */
++
+ static const drm_agp_t drm_agp = {
+ 	&agp_free_memory,
+ 	&agp_allocate_memory,
+@@ -2875,6 +2945,9 @@ static const drm_agp_t drm_agp = {
+ 	&agp_backend_release,
+ 	&agp_copy_info
+ };
++
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12) */
++
+ #undef DRM_AGP_MODULE_GET
+ #undef DRM_AGP_MODULE_PUT
+ 
diff --git a/x11-drivers/ati-drivers/files/ioctl32.patch b/x11-drivers/ati-drivers/files/ioctl32.patch
new file mode 100644
index 000000000000..f5ba9bd60982
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ioctl32.patch
@@ -0,0 +1,14 @@
+--- firegl_public.c.orig	2005-06-18 17:42:41.000000000 -0300
++++ firegl_public.c	2005-06-18 17:43:46.000000000 -0300
+@@ -116,7 +116,11 @@
+ #endif
+ 
+ #ifdef __x86_64__
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
++#include "asm/ioctl.h"
++#else
+ #include "asm/ioctl32.h"
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
+ #include "linux/syscalls.h"
+ #endif
diff --git a/x11-drivers/ati-drivers/files/p1.patch b/x11-drivers/ati-drivers/files/p1.patch
new file mode 100644
index 000000000000..0d25d6ba8cdf
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/p1.patch
@@ -0,0 +1,53 @@
+
+
+2005-03-02 22:32            diff -lu or.c agpgart_be.c            Page 1
+
+
+--- or.c	2005-01-31 19:50:00.000000000 +0200
++++ agpgart_be.c	2005-03-02 22:19:25.000000000 +0200
+@@ -4075,6 +4081,13 @@
+ 			}
+ 		}
+ 	}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) 
++            // the reference count has been increased in agp_backend_initialize.
++        if (device)
++            pci_dev_put(device); 
++#endif
++
+ 	/*
+ 	 * PASS3: Figure out the 8X/4X setting and enable the
+ 	 *        target (our motherboard chipset).
+@@ -5283,6 +5296,12 @@
+             pci_dev_put(device); 
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) 
++            // the reference count has been increased in agp_backend_initialize.
++        if (device)
++            pci_dev_put(device); 
++#endif
++
+     return(0); /* success */
+ }
+ 
+@@ -7428,6 +7447,11 @@
+ 		return rc;
+ 	}
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
++        // decrease the reference count.
++        pci_dev_put(agp_bridge.dev);
++#endif
++
+ 	if (agp_bridge.needs_scratch_page == TRUE) {
+ 		agp_bridge.scratch_page = agp_bridge.agp_alloc_page();
+ 
+
+
+
+
+
+
+
diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml
new file mode 100644
index 000000000000..9562eecc105c
--- /dev/null
+++ b/x11-drivers/ati-drivers/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>