New version

(Portage version: 2.0.53_rc7)

7 files changed, 126 insertions, 895 deletions

diff --git a/x11-drivers/ati-drivers/.#ChangeLog.1.115 b/x11-drivers/ati-drivers/.#ChangeLog.1.115
deleted file mode 100644
index 58204d5c64e5..000000000000
--- a/x11-drivers/ati-drivers/.#ChangeLog.1.115
+++ /dev/null
@@ -1,554 +0,0 @@
-# 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
deleted file mode 100644
index 8a823c6810af..000000000000
--- a/x11-drivers/ati-drivers/.#Manifest.1.178
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 4c26c7ebd0e8..000000000000
--- a/x11-drivers/ati-drivers/.#ati-drivers-8.14.13.ebuild.1.1
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index f6e3f9eff142..105e8f03e28c 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.2 2005/11/12 22:45:10 lu_zero Exp $
+
+*ati-drivers-8.19.10 (12 Nov 2005)
+
+  12 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
+  -.#ati-drivers-8.14.13.ebuild.1.1, -.#ati-drivers-8.16.20.ebuild.1.2,
+  +ati-drivers-8.19.10.ebuild:
+  new release and cleanup
 
   12 Nov 2005; Luca Barbato <lu_zero@gentoo.org> +files/09ati,
   +files/fglrx-2.6.12-inter_module_get.patch,
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index bbf09a534a67..873ae2906c16 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,4 +1,4 @@
-MD5 81b523fe420caecb6e0a239c6c621d9b ChangeLog 23088
+MD5 f190d5371e9f2ca0414f2c395494c0a5 ChangeLog 23303
 MD5 708b3e765580d0d02cbe24049df6c5e1 ati-drivers-8.14.13-r2.ebuild 6687
 MD5 83071b24a0bdc92d1b84865fcfe5488b ati-drivers-8.14.13-r3.ebuild 7673
 MD5 c49603b680cc13d2dc3cecec1d8b45d7 ati-drivers-8.14.13-r4.ebuild 7497
@@ -9,6 +9,7 @@ MD5 709b23aa0176849c66ed9b1ed702dc29 ati-drivers-8.18.6-r1.ebuild 7910
 MD5 e1a0e8561a29e904bd4f5381da97d219 ati-drivers-8.18.6.ebuild 7086
 MD5 5d3dbd42e474d44115bc1a882763e204 ati-drivers-8.18.8-r1.ebuild 8174
 MD5 c9629a18ef6fc50af7d610577e287d58 ati-drivers-8.18.8.ebuild 7857
+MD5 bb4cecdc4f98feb32d4abc1cbad5bada ati-drivers-8.19.10.ebuild 8035
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
@@ -22,6 +23,7 @@ MD5 3e29001f6bcfcec91a4802e6c6e37fc1 files/digest-ati-drivers-8.18.6 156
 MD5 3f9c6083c83f1c87c4b860ef4eca55f6 files/digest-ati-drivers-8.18.6-r1 168
 MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8 168
 MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8-r1 168
+MD5 77910c352e4cc0789f1e084337fe75c4 files/digest-ati-drivers-8.19.10 170
 MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
 MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
 MD5 27685e5b509889cb606108eec627aaac files/fglrx-2.6.14-access_ok.patch 521
diff --git a/x11-drivers/ati-drivers/.#ati-drivers-8.16.20.ebuild.1.2 b/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
index ae97f37320e6..ed60e715fe2a 100644
--- a/x11-drivers/ati-drivers/.#ati-drivers-8.16.20.ebuild.1.2
+++ b/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/.#ati-drivers-8.16.20.ebuild.1.2,v 1.1 2005/11/12 22:17:04 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.1 2005/11/12 22:45:10 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -8,14 +8,15 @@ 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 )"
+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"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=x11-base/xorg-x11-6.8.0
-	 >=x11-base/opengl-update-2.1_pre1"
+	 app-admin/eselect-opengl
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
 
 DEPEND=">=virtual/linux-sources-2.4
 	${RDEPEND}"
@@ -25,10 +26,39 @@ 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
+	if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 7 ]
+	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 $?
@@ -40,15 +70,24 @@ pkg_setup(){
 	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."
+
+		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_present DRM
+	! linux_chkconfig_builtin DRM
 	eend $?
 	if [[ $? -ne 0 ]] ; then
-	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "You have DRM support enabled builtin, the direct rendering"
 	ewarn "will not work."
 	fi
 
@@ -56,30 +95,38 @@ pkg_setup(){
 	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"
 
-	cd ${WORKDIR}
-	rpm_src_unpack
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
 
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	rm -rf ${BASE_NAME}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
 
-	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
 
-#	if kernel_is 2 6
-#	then
-#	fi
-	epatch ${FILESDIR}/ioctl32.patch
-	
-	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+	if kernel_is 2 6
+	then
+		if use amd64
+		then
+		epatch "${FILESDIR}/fglrx-2.6.14-compat_ioctl.patch"
+		fi
+	fi
 }
 
+
 src_compile() {
 	einfo "Building the DRM module..."
-	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	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
@@ -102,12 +149,12 @@ src_compile() {
 			-e "s:\`uname -r\`:${KV_FULL}:" \
 			-i make.sh
 		chmod +x make.sh
-		./make.sh || die "DRM module not built"
+		./make.sh || ewarn "DRM module not built"
 	fi
 }
 
 pkg_preinst() {
-	# Clean the dinamic libGL stuff's home to ensure
+	# 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
@@ -118,12 +165,10 @@ pkg_preinst() {
 src_install() {
 	local ATI_ROOT="/usr/lib/opengl/ati"
 
-	cd ${WORKDIR}
+	cd ${WORKDIR}/common/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"
@@ -132,7 +177,7 @@ src_install() {
 	# 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
+	if [ "${MLTEST/set_abi/}" = "${MLTEST}" ] && has_multilib_profile; then
 		local OABI=${ABI}
 		for ABI in $(get_install_abis); do
 			src_install-libs
@@ -149,20 +194,30 @@ src_install() {
 	fi &> /dev/null
 
 	#apps
-	insinto /etc/env.d
-	doins ${FILESDIR}/09ati
 	exeinto /opt/ati/bin
-	doexe usr/X11R6/bin/*
+	doexe ${BASE_NAME}/usr/X11R6/bin/*
 
 	#ati custom stuff
 	insinto /usr
-	doins -r ${WORKDIR}/usr/include
+	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)
-
+	local inslibdir="$(get_libdir)/$xlibdir"
 	if [ ${#} -eq 2 ]; then
 		pkglibdir=${1}
 		inslibdir=${2}
@@ -172,11 +227,11 @@ src_install-libs() {
 
 	einfo "${pkglibdir} -> ${inslibdir}"
 
-	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
 
 	# The GLX libraries
 	exeinto ${ATI_ROOT}/lib
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	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
 
@@ -188,7 +243,7 @@ src_install-libs() {
 	#Workaround
 	if use opengl ; then
 	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
 		> $D/${ATI_ROOT}/lib/libGL.la
 	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
 	fi
@@ -203,34 +258,38 @@ src_install-libs() {
 	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
 
 	exeinto ${X11_LIB_DIR}/modules/drivers
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	# 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 ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+	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
-	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
-	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+	# 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 ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+	doins ${BASE_NAME}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
 
+	dodir /etc
+	cp -pPR ${BASE_NAME}/etc/* ${D}/etc/
 }
 
 
 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
+	/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\""
+	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"
@@ -238,10 +297,10 @@ pkg_postinst() {
 	ewarn "# emerge -Nu ati-drivers"
 	fi
 	# DRM module
-	update-modules
+	linux-mod_pkg_postinst
 }
 
 pkg_postrm() {
-	opengl-update --use-old xorg-x11
+	/usr/bin/eselect opengl set --use-old xorg-x11
 }
 
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.19.10 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.19.10
new file mode 100644
index 000000000000..fb430984c6c1
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.19.10
@@ -0,0 +1,2 @@
+MD5 e35876bafb54f23cebbaf822646646eb ati-driver-installer-8.19.10-i386.run 63744416
+MD5 6d14ff7c8a28d24a0ba0c55930d5fe6a ati-driver-installer-8.19.10-x86_64.run 54043719