[gentoo-commits] dev/axs:master commit in: x11-drivers/xf86-input-mouse/, x11-drivers/xf86-video-apm/, ...

[Ian Stakenvicius]

commit:     919d33cbe55b241e1637842fa1f46b4c024588a5
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 19:27:23 2012 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 19:27:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=919d33cb

Synced with tree 2012-07-01 ~19:00UTC
Upgraded x11-drivers/* , now drivers should rebuild on xorg-server upgrades

---
 dev-lang/spidermonkey/Manifest                     |    6 +-
 dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild |    4 +-
 dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild    |    4 +-
 dev-libs/libyaml/Manifest                          |    4 +-
 dev-libs/libyaml/libyaml-0.1.4.ebuild              |    4 +-
 dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild |    4 +-
 dev-perl/Encode-Locale/Manifest                    |    4 +-
 dev-perl/File-Listing/File-Listing-6.40.0.ebuild   |    4 +-
 dev-perl/File-Listing/Manifest                     |    4 +-
 dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild     |    4 +-
 dev-perl/HTTP-Daemon/Manifest                      |    4 +-
 dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild   |    4 +-
 dev-perl/HTTP-Message/Manifest                     |    4 +-
 dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild           |    4 +-
 dev-perl/IPC-Run3/Manifest                         |    4 +-
 .../LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild    |    4 +-
 dev-perl/LWP-MediaTypes/Manifest                   |    4 +-
 dev-perl/MogileFS-Utils/Manifest                   |    4 +-
 .../MogileFS-Utils/MogileFS-Utils-2.250.0.ebuild   |   20 +
 dev-perl/Net-HTTP/Manifest                         |    4 +-
 dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild           |    4 +-
 dev-perl/mogilefs-server/Manifest                  |    4 +-
 .../mogilefs-server/mogilefs-server-2.640.0.ebuild |   99 +++
 dev-perl/yaml/Manifest                             |    4 +-
 dev-perl/yaml/yaml-0.810.0.ebuild                  |    4 +-
 media-gfx/graphite2/Manifest                       |    6 +-
 media-gfx/graphite2/graphite2-1.1.2.ebuild         |  100 ----
 media-gfx/graphite2/graphite2-1.1.3.ebuild         |    5 +-
 media-libs/libpng/Manifest                         |   10 +
 media-libs/libpng/libpng-1.2.49.ebuild             |   39 ++
 media-libs/libpng/libpng-1.5.10.ebuild             |   53 ++
 media-libs/libpng/libpng-1.5.11.ebuild             |   43 ++
 media-libs/ming/Manifest                           |    6 +-
 media-libs/ming/ming-0.4.3-r2.ebuild               |    4 +-
 media-libs/ming/ming-0.4.4.ebuild                  |    6 +-
 net-irc/irssi/Manifest                             |    2 +-
 net-irc/irssi/irssi-9999.ebuild                    |    2 +-
 net-print/cups-filters/Manifest                    |    2 +-
 net-print/cups-filters/cups-filters-9999.ebuild    |    2 +-
 net-print/cups/{Manifest => .#Manifest.1.578}      |   39 ++-
 net-print/cups/Manifest                            |    8 +-
 ...ups-1.6_beta1-r1.ebuild => cups-1.6_rc1.ebuild} |   10 +-
 net-print/cups/cups-9999.ebuild                    |    4 +-
 sci-libs/gdal/Manifest                             |    2 +-
 sci-libs/gdal/gdal-1.9.1.ebuild                    |    2 +-
 sys-auth/polkit/.#Manifest.1.91                    |    8 -
 sys-auth/polkit/.#Manifest.1.93                    |    9 -
 sys-auth/polkit/Manifest                           |    9 +-
 sys-auth/polkit/polkit-0.104-r1.ebuild             |    5 +-
 sys-auth/polkit/polkit-0.105.ebuild                |    5 +-
 sys-auth/polkit/polkit-0.106-r5.ebuild             |    5 +-
 ...-0.106-r2.ebuild.1.3 => polkit-0.106-r6.ebuild} |   69 ++-
 x11-drivers/ati-drivers/Manifest                   |   14 +
 x11-drivers/ati-drivers/ati-drivers-12.2.ebuild    |  600 +++++++++++++++++++
 x11-drivers/ati-drivers/ati-drivers-12.4.ebuild    |  613 +++++++++++++++++++
 x11-drivers/ati-drivers/ati-drivers-12.6.ebuild    |  625 ++++++++++++++++++++
 .../ati-drivers/files/amd-drivers-3.2.7.1.patch    |   19 +
 .../files/ati-drivers-12.2-redefine-WARN.patch     |   42 ++
 .../ati-drivers/files/ati-drivers-old_rsp.patch    |   24 +
 .../files/ati-powermode-opt-path-2.patch           |   42 ++
 x11-drivers/ati-drivers/files/atieventsd.init      |   20 +
 x11-drivers/ati-drivers/files/switchlibGL          |   61 ++
 x11-drivers/xf86-input-acecad/Manifest             |    6 +
 .../xf86-input-acecad-1.4.0.ebuild                 |   16 +
 .../xf86-input-acecad-1.5.0.ebuild                 |   15 +
 x11-drivers/xf86-input-aiptek/Manifest             |    8 +
 .../xf86-input-aiptek-1.3.1.ebuild                 |   15 +
 .../xf86-input-aiptek-1.4.0.ebuild                 |   14 +
 .../xf86-input-aiptek-1.4.1.ebuild                 |   14 +
 x11-drivers/xf86-input-evdev/Manifest              |    7 +
 ...86-input-evdev-2.7.0-horizontal-scrolling.patch |   27 +
 .../xf86-input-evdev/xf86-input-evdev-2.6.0.ebuild |   16 +
 .../xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild |   20 +
 x11-drivers/xf86-input-fpit/Manifest               |    7 +
 .../files/xf86-input-fpit-1.3.0-abi.patch          |   95 +++
 .../xf86-input-fpit-1.3.0-r1.ebuild                |   21 +
 .../xf86-input-fpit/xf86-input-fpit-1.4.0.ebuild   |   14 +
 x11-drivers/xf86-input-hyperpen/Manifest           |    6 +
 .../xf86-input-hyperpen-1.3.0.ebuild               |   17 +
 .../xf86-input-hyperpen-1.4.1.ebuild               |   14 +
 x11-drivers/xf86-input-joystick/Manifest           |    8 +
 .../xf86-input-joystick-1.5.0.ebuild               |   15 +
 .../xf86-input-joystick-1.6.0.ebuild               |   16 +
 .../xf86-input-joystick-1.6.1.ebuild               |   16 +
 x11-drivers/xf86-input-keyboard/Manifest           |    6 +
 .../xf86-input-keyboard-1.6.0.ebuild               |   18 +
 .../xf86-input-keyboard-1.6.1.ebuild               |   14 +
 x11-drivers/xf86-input-mouse/Manifest              |    8 +
 .../xf86-input-mouse/xf86-input-mouse-1.7.0.ebuild |   17 +
 .../xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild |   14 +
 .../xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild |   14 +
 x11-drivers/xf86-input-mtrack/Manifest             |    9 +
 .../files/xf86-input-mtrack-0.1.1-autoconf.patch   |   92 +++
 .../files/xf86-input-mtrack-0.1.1-export.patch     |   10 +
 .../xf86-input-mtrack-0.2.0-drop-mtrack-test.patch |   13 +
 .../xf86-input-mtrack-0.1.1-r1.ebuild              |   52 ++
 .../xf86-input-mtrack-0.2.0.ebuild                 |   52 ++
 x11-drivers/xf86-input-mutouch/Manifest            |    6 +
 .../xf86-input-mutouch-1.2.1.ebuild                |   17 +
 .../xf86-input-mutouch-1.3.0.ebuild                |   14 +
 x11-drivers/xf86-input-penmount/Manifest           |    6 +
 .../xf86-input-penmount-1.4.1.ebuild               |   15 +
 .../xf86-input-penmount-1.5.0.ebuild               |   14 +
 x11-drivers/xf86-input-synaptics/Manifest          |   10 +
 .../xf86-input-synaptics-1.4.0.ebuild              |   37 ++
 .../xf86-input-synaptics-1.5.2.ebuild              |   36 ++
 .../xf86-input-synaptics-1.6.1.ebuild              |   37 ++
 .../xf86-input-synaptics-1.6.2.ebuild              |   37 ++
 x11-drivers/xf86-input-tslib/Manifest              |    6 +
 .../files/fix-overlapped-variable.patch            |   20 +
 .../files/xf86-input-tslib-port-ABI-12-r48.patch   |  191 ++++++
 .../xf86-input-tslib-0.0.6-r2.ebuild               |   31 +
 x11-drivers/xf86-input-vmmouse/Manifest            |    8 +
 .../xf86-input-vmmouse-12.7.0.ebuild               |   32 +
 .../xf86-input-vmmouse-12.8.0.ebuild               |   30 +
 .../xf86-input-vmmouse-12.9.0.ebuild               |   30 +
 x11-drivers/xf86-input-void/Manifest               |    6 +
 .../xf86-input-void/xf86-input-void-1.3.1.ebuild   |   17 +
 .../xf86-input-void/xf86-input-void-1.4.0.ebuild   |   14 +
 x11-drivers/xf86-input-wacom/Manifest              |   12 +
 .../xf86-input-wacom-0.11.0.ebuild                 |   55 ++
 .../xf86-input-wacom-0.11.1.ebuild                 |   57 ++
 .../xf86-input-wacom-0.13.0.ebuild                 |   56 ++
 .../xf86-input-wacom-0.14.0.ebuild                 |   56 ++
 .../xf86-input-wacom-0.15.0.ebuild                 |   56 ++
 x11-drivers/xf86-video-apm/Manifest                |    6 +
 .../xf86-video-apm/xf86-video-apm-1.2.3.ebuild     |   22 +
 .../xf86-video-apm/xf86-video-apm-1.2.4.ebuild     |   15 +
 x11-drivers/xf86-video-ark/Manifest                |    6 +
 .../xf86-video-ark/xf86-video-ark-0.7.3.ebuild     |   19 +
 .../xf86-video-ark/xf86-video-ark-0.7.4.ebuild     |   15 +
 x11-drivers/xf86-video-ast/Manifest                |    6 +
 .../xf86-video-ast/xf86-video-ast-0.93.10.ebuild   |   12 +
 .../xf86-video-ast/xf86-video-ast-0.95.0.ebuild    |   12 +
 x11-drivers/xf86-video-ati/Manifest                |   25 +
 .../xf86-video-ati-6.14.0-xorg-server-1.10.patch   |   33 +
 .../files/xf86-video-ati-6.14.3-pcitag.patch       |   41 ++
 .../xf86-video-ati-6.14.3-xorg-server-1.12.patch   |  118 ++++
 ...ideo-ati-6.14.4-exa-solid-accel-evergreen.patch |  287 +++++++++
 ...f86-video-ati-6.14.4-exa-solid-accel-r100.patch |  179 ++++++
 ...f86-video-ati-6.14.4-exa-solid-accel-r200.patch |  176 ++++++
 ...f86-video-ati-6.14.4-exa-solid-accel-r300.patch |  560 ++++++++++++++++++
 .../xf86-video-ati/xf86-video-ati-6.13.2.ebuild    |   31 +
 .../xf86-video-ati/xf86-video-ati-6.14.0.ebuild    |   35 ++
 .../xf86-video-ati/xf86-video-ati-6.14.1.ebuild    |   25 +
 .../xf86-video-ati/xf86-video-ati-6.14.2.ebuild    |   25 +
 .../xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild |   31 +
 .../xf86-video-ati/xf86-video-ati-6.14.3.ebuild    |   30 +
 .../xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild |   32 +
 .../xf86-video-ati/xf86-video-ati-6.14.4.ebuild    |   26 +
 .../xf86-video-ati/xf86-video-ati-6.14.5.ebuild    |   25 +
 x11-drivers/xf86-video-chips/Manifest              |    4 +
 .../xf86-video-chips/xf86-video-chips-1.2.4.ebuild |   12 +
 x11-drivers/xf86-video-cirrus/Manifest             |   10 +
 .../xf86-video-cirrus-1.3.2-pcitag-declare.patch   |   42 ++
 .../xf86-video-cirrus-1.3.2-pcitag-redefine.patch  |   35 ++
 .../xf86-video-cirrus-1.3.2-xorg-server-1.12.patch |   61 ++
 .../xf86-video-cirrus-1.3.2-r1.ebuild              |   19 +
 .../xf86-video-cirrus-1.3.2.ebuild                 |   19 +
 .../xf86-video-cirrus-1.4.0.ebuild                 |   13 +
 x11-drivers/xf86-video-dummy/Manifest              |    6 +
 .../xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild |   21 +
 .../xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild |   24 +
 x11-drivers/xf86-video-geode/Manifest              |    6 +
 .../xf86-video-geode-2.11.12.ebuild                |   21 +
 .../xf86-video-geode-2.11.13.ebuild                |   24 +
 x11-drivers/xf86-video-glint/Manifest              |    8 +
 .../xf86-video-glint/xf86-video-glint-1.2.5.ebuild |   29 +
 .../xf86-video-glint/xf86-video-glint-1.2.6.ebuild |   19 +
 .../xf86-video-glint/xf86-video-glint-1.2.7.ebuild |   19 +
 x11-drivers/xf86-video-i128/Manifest               |    6 +
 .../xf86-video-i128/xf86-video-i128-1.3.4.ebuild   |   21 +
 .../xf86-video-i128/xf86-video-i128-1.3.5.ebuild   |   15 +
 x11-drivers/xf86-video-i740/Manifest               |    6 +
 .../xf86-video-i740/xf86-video-i740-1.3.2.ebuild   |   19 +
 .../xf86-video-i740/xf86-video-i740-1.3.3.ebuild   |   14 +
 x11-drivers/xf86-video-intel/Manifest              |   29 +
 ...el-value-for-all-formats-to-avoid-hitting.patch |  140 +++++
 .../xf86-video-intel-2.15-batch-overrun.patch      |   26 +
 .../xf86-video-intel-2.15-unsigned-promotion.patch |   32 +
 .../files/xf86-video-intel-2.17-sna-offsets.patch  |   31 +
 .../xf86-video-intel-2.17-sna-pipeline-flush.patch |   48 ++
 .../xf86-video-intel-2.10.0-r1.ebuild              |   55 ++
 .../xf86-video-intel-2.11.0.ebuild                 |   50 ++
 .../xf86-video-intel-2.13.0.ebuild                 |   50 ++
 .../xf86-video-intel-2.14.0.ebuild                 |   50 ++
 .../xf86-video-intel-2.15.0-r1.ebuild              |   48 ++
 .../xf86-video-intel-2.16.0.ebuild                 |   49 ++
 .../xf86-video-intel-2.17.0-r3.ebuild              |   56 ++
 .../xf86-video-intel-2.18.0.ebuild                 |   50 ++
 .../xf86-video-intel-2.19.0.ebuild                 |   54 ++
 .../xf86-video-intel/xf86-video-intel-2.8.1.ebuild |   32 +
 .../xf86-video-intel/xf86-video-intel-2.9.1.ebuild |   31 +
 x11-drivers/xf86-video-ivtv/Manifest               |    4 +
 .../xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild   |   14 +
 x11-drivers/xf86-video-mach64/Manifest             |    8 +
 .../xf86-video-mach64-6.8.2.ebuild                 |   31 +
 .../xf86-video-mach64-6.9.0.ebuild                 |   24 +
 .../xf86-video-mach64-6.9.1.ebuild                 |   24 +
 x11-drivers/xf86-video-mga/Manifest                |    6 +
 .../xf86-video-mga/xf86-video-mga-1.4.13.ebuild    |   28 +
 .../xf86-video-mga/xf86-video-mga-1.5.0.ebuild     |   20 +
 x11-drivers/xf86-video-modesetting/Manifest        |    6 +
 .../xf86-video-modesetting-0.3.0.ebuild            |   12 +
 .../xf86-video-modesetting-0.4.0.ebuild            |   12 +
 x11-drivers/xf86-video-neomagic/Manifest           |    6 +
 .../xf86-video-neomagic-1.2.5.ebuild               |   20 +
 .../xf86-video-neomagic-1.2.6.ebuild               |   13 +
 x11-drivers/xf86-video-newport/Manifest            |    6 +
 .../xf86-video-newport-0.2.3.ebuild                |   14 +
 .../xf86-video-newport-0.2.4.ebuild                |   14 +
 x11-drivers/xf86-video-nouveau/Manifest            |   12 +
 .../xf86-video-nouveau-0.0.16_pre20111109.ebuild   |   33 +
 .../xf86-video-nouveau-0.0.16_pre20120305.ebuild   |   33 +
 .../xf86-video-nouveau-0.0.16_pre20120322.ebuild   |   33 +
 .../xf86-video-nouveau-0.0.16_pre20120508.ebuild   |   32 +
 .../xf86-video-nouveau-1.0.1.ebuild                |   31 +
 x11-drivers/xf86-video-openchrome/Manifest         |    6 +
 .../xf86-video-openchrome-0.2.905.ebuild           |   51 ++
 .../xf86-video-openchrome-0.2.906.ebuild           |   51 ++
 x11-drivers/xf86-video-qxl/Manifest                |   10 +
 .../xf86-video-qxl/xf86-video-qxl-0.0.13.ebuild    |   18 +
 .../xf86-video-qxl/xf86-video-qxl-0.0.14.ebuild    |   16 +
 .../xf86-video-qxl/xf86-video-qxl-0.0.16.ebuild    |   24 +
 .../xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild    |   24 +
 x11-drivers/xf86-video-r128/Manifest               |    6 +
 .../xf86-video-r128/xf86-video-r128-6.8.1.ebuild   |   31 +
 .../xf86-video-r128-6.8.2-r1.ebuild                |   21 +
 x11-drivers/xf86-video-s3/Manifest                 |    6 +
 .../xf86-video-s3/xf86-video-s3-0.6.3.ebuild       |   19 +
 .../xf86-video-s3/xf86-video-s3-0.6.4.ebuild       |   14 +
 x11-drivers/xf86-video-s3virge/Manifest            |    6 +
 .../xf86-video-s3virge-1.10.4.ebuild               |   19 +
 .../xf86-video-s3virge-1.10.5.ebuild               |   14 +
 x11-drivers/xf86-video-savage/Manifest             |    6 +
 .../xf86-video-savage-2.3.3-r1.ebuild              |   22 +
 .../xf86-video-savage-2.3.4-r1.ebuild              |   22 +
 x11-drivers/xf86-video-siliconmotion/Manifest      |    9 +
 .../xf86-video-siliconmotion-1.7.5-abi-check.patch |   22 +
 .../xf86-video-siliconmotion-1.7.5-new-vgahw.patch |   21 +
 ...ideo-siliconmotion-1.7.5-xorg-server-1.12.patch |   25 +
 .../xf86-video-siliconmotion-1.7.5.ebuild          |   20 +
 .../xf86-video-siliconmotion-1.7.6.ebuild          |   14 +
 x11-drivers/xf86-video-sis/Manifest                |    6 +
 .../xf86-video-sis/xf86-video-sis-0.10.3.ebuild    |   32 +
 .../xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild |   17 +
 x11-drivers/xf86-video-tdfx/Manifest               |    6 +
 .../xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild   |   27 +
 .../xf86-video-tdfx-1.4.4-r1.ebuild                |   21 +
 x11-drivers/xf86-video-trident/Manifest            |    6 +
 .../xf86-video-trident-1.3.4.ebuild                |   20 +
 .../xf86-video-trident-1.3.5.ebuild                |   13 +
 x11-drivers/xf86-video-vesa/Manifest               |    9 +
 .../files/xf86-video-vesa-2.3.0-pci-domains.patch  |   55 ++
 .../xf86-video-vesa-2.3.0-xorg-server-1.12.patch   |   30 +
 .../xf86-video-vesa-2.3.0-r1.ebuild                |   18 +
 .../xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild   |   15 +
 .../xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild   |   13 +
 x11-drivers/xf86-video-vmware/Manifest             |   12 +
 .../xf86-video-vmware-11.0.3.ebuild                |   21 +
 .../xf86-video-vmware-11.1.0.ebuild                |   15 +
 .../xf86-video-vmware-12.0.0.ebuild                |   15 +
 .../xf86-video-vmware-12.0.1.ebuild                |   16 +
 .../xf86-video-vmware-12.0.2.ebuild                |   16 +
 x11-libs/libXmu/Manifest                           |    4 +-
 x11-libs/libXmu/libXmu-1.1.1.ebuild                |    4 +-
 x11-libs/xcb-util/Manifest                         |    6 +-
 x11-libs/xcb-util/xcb-util-0.3.8.ebuild            |    8 +-
 x11-libs/xcb-util/xcb-util-0.3.9.ebuild            |    4 +-
 269 files changed, 8526 insertions(+), 252 deletions(-)

diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 5e478e5..0785895 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -17,7 +17,7 @@ EBUILD spidermonkey-1.7.0-r2.ebuild 1664 RMD160 2eea40d279729740380fd8eca22d1425
 EBUILD spidermonkey-1.7.0.ebuild 1432 RMD160 9dc3f12649f67fe727f8b327a54bbc91c0522358 SHA1 411aad11f1d1beb4435aa19a43d96447b11e7dac SHA256 5df2e8917fce96363d2128a2fdafc623aa159e60682591b347201b062778a99e
 EBUILD spidermonkey-1.8.2.15-r1.ebuild 1938 RMD160 e8c4748dbd6ebb9e1a8d6f1d318c44418bcd2c8c SHA1 f59d3fd53e89d41139d2159822a328a4bcfa6ceb SHA256 b1fc8c11374df02de4ae2136127958f3d5b7d4c9dca349e396f5127769e9c0f2
 EBUILD spidermonkey-1.8.2.15.ebuild 1907 RMD160 597288c1c1478e152f492add1a9222833dc2272a SHA1 ab6719373203f4270ff9bb2c384869d28f379740 SHA256 e03a07403e86e8a20c7efefc59dc5e84853cb8eb459e9685de79d7d90f46de19
-EBUILD spidermonkey-1.8.5-r1.ebuild 3120 RMD160 eef86cb44c0ff51b499cb7fe6cc2eccfc8c67e27 SHA1 65f8a34b18409e243a01cf7eaedafe99eb70e62b SHA256 1cbe794b58e37a656a1cc2a56ea7eed2e3f95828020d48863f6906252faa3de2
-EBUILD spidermonkey-1.8.7.ebuild 3463 RMD160 2dbcaa35304180b4cf361ea19dabc37bb1687b58 SHA1 5775ee624640109480e318b44121bbe4a0ce4e6c SHA256 a5d9397a9da3b811ab1fd547e17d13ca55d4399cd7217cd312bc558d30976182
-MISC ChangeLog 12126 RMD160 aaa3a7af0d5cdca8a8b2ff14ba032bbdced1c56a SHA1 6c091ad48ffb96d1864337d38b8d91e5b6cab066 SHA256 718a0a29975f90cd5628abc4519203c1b93ae2c5e0445d9b115fea5a4559e08f
+EBUILD spidermonkey-1.8.5-r1.ebuild 3121 RMD160 4c748ad97ed84d8c94594bd86de8d1f70994911a SHA1 42cc8792a6347a209d723f37ecc516f8a7ae47bf SHA256 503c565751e5e776c4923a60d3fd22e2278c5c39f08223d489fae54c67b648f9
+EBUILD spidermonkey-1.8.7.ebuild 3464 RMD160 b71983731438d77012214d2045e88f7bc60c1fcb SHA1 fe4b5ae24cfc6d7c5bc022c09aeddc59ab410867 SHA256 d1a57913e711e3f725f671697c41a656129c260256491874241cd3253cbe2521
+MISC ChangeLog 12258 RMD160 63be90bdba2084f217f12c2aef7b7400cbba8431 SHA1 527f074fa7242de7fd729d09ee7e57dc1e251886 SHA256 7f17195e3784d8dbbec3810984cde41a629bde388ccba793cdc527e68d1aac9d
 MISC metadata.xml 523 RMD160 b40a1ffd94bc32fd5045b99160481c2b95d69d30 SHA1 91eb56541e242621c81e38eb9e9f0c4dea6f099f SHA256 876e7996ea990b78088ea8ef1f0445658fea0bb7cf0a1e07cd1db2bae870307f

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
index f1372a4..2d3dc27 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.8 2012/06/19 23:18:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.5-r1.ebuild,v 1.9 2012/06/29 15:50:38 jer Exp $
 
 EAPI="4-slot-abi"
 WANT_AUTOCONF="2.1"
@@ -16,7 +16,7 @@ SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
 
 LICENSE="NPL-1.1"
 SLOT="0/185"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug static-libs test"
 
 S="${WORKDIR}/${MY_P}"

diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
index 4123aa4..213ad60 100644
--- a/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild,v 1.2 2012/06/19 23:18:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/spidermonkey/spidermonkey-1.8.7.ebuild,v 1.3 2012/06/29 15:50:38 jer Exp $
 
 EAPI="4-slot-abi"
 WANT_AUTOCONF="2.1"
@@ -18,7 +18,7 @@ SRC_URI="http://people.mozilla.com/~dmandelin/${TARBALL_P}.tar.gz
 
 LICENSE="NPL-1.1"
 SLOT="0/187"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug jit static-libs test"
 
 S="${WORKDIR}/${MY_P}"

diff --git a/dev-libs/libyaml/Manifest b/dev-libs/libyaml/Manifest
index 34001c8..f8a466e 100644
--- a/dev-libs/libyaml/Manifest
+++ b/dev-libs/libyaml/Manifest
@@ -5,6 +5,6 @@ DIST yaml-0.1.4.tar.gz 471759 RMD160 5051545022ffa4c78e63fed6f3af30f90e931497 SH
 EBUILD libyaml-0.0.1.ebuild 864 RMD160 8c717ae205720d55a896d41fa0a983ac578d734f SHA1 70fdfcf968709a710556ac15e8bc16fbf6d77607 SHA256 7f1c8104dc65401ce22f562f763383a7e5aa4dcf96bc2de5e0ebc9d361eb462a
 EBUILD libyaml-0.1.2.ebuild 890 RMD160 f45c5ad7e3d15b2cbd7c003116641990196cfd33 SHA1 f742aad3ce9ea2b7886e51b816d031fd622ba070 SHA256 7914fb3ded6b7fecb4bed788e49f98b22628bade81b3742ad83f0cb2e115029d
 EBUILD libyaml-0.1.3.ebuild 979 RMD160 dd8c726f6b87a285fbd637d186748defaaf55918 SHA1 cf02d0d713ceb9770ae359f584239acb5abd5d7e SHA256 8b4488fbc1bdd0dbdd55a5f2d8ba297f846d0e3598394587519c47bdb9544126
-EBUILD libyaml-0.1.4.ebuild 1037 RMD160 72a82237abc466fdef1de237d85bfafb45a6d4c9 SHA1 d1145f26acca131456c73f197bc0a07cef133d4f SHA256 fad1a7c570c6e0407884d8e835b78c1bec5967da24cbac01cf1988b57d204d2f
-MISC ChangeLog 2751 RMD160 92d53cf278b2844786934103782ee58278d4337b SHA1 6d048feb42d617f0f2a77f2a092f91763e4870d5 SHA256 6385d637fbc690ed7679793e2bc1bcadc8f96f3058e143802f46b1dc0899c9be
+EBUILD libyaml-0.1.4.ebuild 1034 RMD160 9f388ccb39ba80addc2e15adef2e44dacd48e919 SHA1 0e8be94142f5e6b0c5079f239e723b1d772a3621 SHA256 cfb3342470e22b3d51e248e6327e3db54d07fda9ff7829d1d0afce07f7986dcb
+MISC ChangeLog 2854 RMD160 0e5893660f8f2fd54feb775e2ccbaaa028f4c771 SHA1 377cd66907264913be24271d3d2649ed1b593bc9 SHA256 a1ccbd0af5111ad8384af17e6c9e61add05616602fad4f20898b91a78809cffd
 MISC metadata.xml 385 RMD160 6f5210fb839b539e3d039fd01c4f687b9ef43af9 SHA1 11c820590de744b57148be875b915631fd4a36ce SHA256 7c7be37712d301550a32df2bbde3319b2881e9ec9e55390e7efbbe0bf0219595

diff --git a/dev-libs/libyaml/libyaml-0.1.4.ebuild b/dev-libs/libyaml/libyaml-0.1.4.ebuild
index bb32e34..6f2783c 100644
--- a/dev-libs/libyaml/libyaml-0.1.4.ebuild
+++ b/dev-libs/libyaml/libyaml-0.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.4.ebuild,v 1.6 2012/06/28 01:19:50 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libyaml/libyaml-0.1.4.ebuild,v 1.7 2012/07/01 15:30:57 hattya Exp $
 
 EAPI="4-slot-abi"
 
@@ -14,7 +14,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/2.0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples test static-libs"
 
 S="${WORKDIR}/${MY_P}"

diff --git a/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild b/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild
index 8272c90..a21e794 100644
--- a/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild,v 1.7 2012/06/28 12:47:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Encode-Locale/Encode-Locale-1.30.0.ebuild,v 1.8 2012/06/29 14:55:08 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Determine the locale encoding"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST=do

diff --git a/dev-perl/Encode-Locale/Manifest b/dev-perl/Encode-Locale/Manifest
index 2e2c98e..9c6de5c 100644
--- a/dev-perl/Encode-Locale/Manifest
+++ b/dev-perl/Encode-Locale/Manifest
@@ -1,6 +1,6 @@
 DIST Encode-Locale-1.02.tar.gz 6753 RMD160 c0848157d2d78952817f3d86811cbce5bcab1020 SHA1 25f79c9fc7636887ddf00e0a759a8cd4b9cb492c SHA256 20c5ba2ab0ac00f0e6d5c5d405f2ccb3fdb0212de3519ec8d16688574d8d5340
 DIST Encode-Locale-1.03.tar.gz 6846 RMD160 9f7b4a8bb68caea7fca48c97e2d935dfee3cd9a6 SHA1 b37c3dbb98b56d31cc8af35a548096bfbf44820f SHA256 f76337e0933225914111fcc3319ff4db359b1abfd1aa56dff2df5378db0e2d55
 EBUILD Encode-Locale-1.20.0.ebuild 601 RMD160 0a4369e4dc155392706b49269ad52f9a7adc2b92 SHA1 714c6cd5aa42b76a5345509e1d259ad62b5a086a SHA256 f9a569809cdf43371cfc08ca39a52a8591020db5263d0d0ff41ebd252a342708
-EBUILD Encode-Locale-1.30.0.ebuild 629 RMD160 9ca015c5fbdfbb4e57e0864efc5ef3b423fcbe98 SHA1 73695fed765af3925d7804fdaae4da0a2c93e6a2 SHA256 b64fbb944d981b9e3086e262c2571b64ad6637404c0f9a22b5ecb9dcc384dbc2
-MISC ChangeLog 3496 RMD160 feebb0177e755b536e5f0f4a84f605a0b8d18605 SHA1 fc48d81983e3e14735e82de439700397211d14cd SHA256 fc35628593c86a680b04086ff7c38a17ff49733d23a836f34512f1cd5018dbc9
+EBUILD Encode-Locale-1.30.0.ebuild 625 RMD160 87606d115e986838b0ecab57412e77066c56810a SHA1 c6adb51a60c5ed00271e6a1635c78488da60b8b8 SHA256 95608a4d9cd07e42244bddf1eef9aebdc89145ccd449efcc748960515c6b7e52
+MISC ChangeLog 3603 RMD160 e58273a1fca22769290fff552c5256e793ea5e51 SHA1 45375e235f7774d0c548914881e81bcd9b4321d6 SHA256 748861f3f9f071eb3f4728e26e2eb7bc7a4dd538084c0530e9e0a923a36339e7
 MISC metadata.xml 293 RMD160 5778fed837e8554643f490123190ca64dde728af SHA1 d8d184ee4b08f7a5ab16ea87d869c9d9b89e6ce8 SHA256 6e251bf79152a0bf7d72c1f75d460fcce58f97eda7f3fa3f1e9ca1d9c09321af

diff --git a/dev-perl/File-Listing/File-Listing-6.40.0.ebuild b/dev-perl/File-Listing/File-Listing-6.40.0.ebuild
index 3b1c977..1b30539 100644
--- a/dev-perl/File-Listing/File-Listing-6.40.0.ebuild
+++ b/dev-perl/File-Listing/File-Listing-6.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Listing/File-Listing-6.40.0.ebuild,v 1.7 2012/06/28 12:49:39 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Listing/File-Listing-6.40.0.ebuild,v 1.8 2012/06/29 14:55:47 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Parse directory listings"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/dev-perl/File-Listing/Manifest b/dev-perl/File-Listing/Manifest
index 0b1317f..56ad944 100644
--- a/dev-perl/File-Listing/Manifest
+++ b/dev-perl/File-Listing/Manifest
@@ -1,6 +1,6 @@
 DIST File-Listing-6.03.tar.gz 51415 RMD160 d56987dd8cdcf1b749344017b2a6cbf46bd1be73 SHA1 38a2fe3f533ee1d7999a16a389c86e6af6e638ea SHA256 23e96035f2759f211d3e9027d608c5fb6c81ba1b7cdd1079c6fa597613b99094
 DIST File-Listing-6.04.tar.gz 51536 RMD160 f19e7c2f3189205c9c7b8885fbe91dcc1854904e SHA1 02a41fe1b91f3f198712965360192f31d6d8d74e SHA256 1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5
 EBUILD File-Listing-6.30.0.ebuild 691 RMD160 7cb01c0ec73475bfd2cd4ecefa0b24dc2877c222 SHA1 28e7df569dc824d99ba8422f88800bd6a1ec9092 SHA256 af572c750b9e280f9cbc6bb871ca710150d908bbb97607f97a4891cd724118b3
-EBUILD File-Listing-6.40.0.ebuild 709 RMD160 84cfe90c9663894a9f41573342a4b7ebeb174ff7 SHA1 a2427eae6f87aa6077724a8b93c8c144286587cb SHA256 689796bbccd90f7bbd1782accbaec2e987acc2d10b6ebbb115cc9db12635ccdb
-MISC ChangeLog 3707 RMD160 e57777d629fc466f3ae1544e0ac68f30cc49c606 SHA1 9f21875e0550140d25ca9d775070f9b9392863a4 SHA256 9a665e64dab360110f873230553affa7e3f9b75967c87979d372e33809cee0f1
+EBUILD File-Listing-6.40.0.ebuild 705 RMD160 c0c0198be76d48717f6cac8a93dbb6448331f042 SHA1 54fa3d13155f13e778fc89663ecaf09b3626b473 SHA256 4b67d90357e82c23f30d9c5579f2ab38fd37572fd583cae1d1aa968e7df278be
+MISC ChangeLog 3813 RMD160 890fc4534c4ce4d476e638e8636fff3beb2e59aa SHA1 77479a72de46cdd190385ed088e134e23234f73b SHA256 dab116a695dfc192114b896c698b6ef75e2988f8af88488676f5d61a9e7e62a5
 MISC metadata.xml 617 RMD160 3aa34cbec354a32427fbf3d71ef8bdef4baf801c SHA1 0d028c5b3266088cc45d5a984b1f0c36b69246f5 SHA256 8c7a13a99353ea67ada54fb43403666a55710f90a8438c4609e6cf4f65134ead

diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild
index 77070a4..5477095 100644
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild,v 1.6 2012/06/22 15:49:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0.ebuild,v 1.7 2012/06/29 14:56:28 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Base class for simple HTTP servers"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/dev-perl/HTTP-Daemon/Manifest b/dev-perl/HTTP-Daemon/Manifest
index b7816d6..ec5a4a8 100644
--- a/dev-perl/HTTP-Daemon/Manifest
+++ b/dev-perl/HTTP-Daemon/Manifest
@@ -1,6 +1,6 @@
 DIST HTTP-Daemon-6.00.tar.gz 18512 RMD160 b372f2281bf256139ff1ebf80ddd784b00974ed4 SHA1 cf33910549d83252f662754022b8d299f351f5bd SHA256 4801d349c52813a1e49d6b31962f45705bae76fb907279e75933596c04e0de89
 DIST HTTP-Daemon-6.01.tar.gz 18628 RMD160 426d00f81025ed56e861384a8722163589814a66 SHA1 d3b7614d4b3be4b61d26011efe90026c955102a4 SHA256 43fd867742701a3f9fcc7bd59838ab72c6490c0ebaf66901068ec6997514adc2
 EBUILD HTTP-Daemon-6.0.0.ebuild 773 RMD160 41b7b1d55e4b3a46cbbc9b88318da3636eaa7dcc SHA1 977d7c05cc1f21d1d7a27bea010324d23e1878ed SHA256 f32a2f709241e626ae4efb0c55ca94287fc3d54a5783a0dea1680db556b046da
-EBUILD HTTP-Daemon-6.10.0.ebuild 803 RMD160 f209f1452f5d14202c91d4751194777328016703 SHA1 200aadac820cdaf933f1e324de98d0085153be38 SHA256 362235c4cac36bee0f6c7cea3bfca279d1503366942661f99f16dda9cf11e7a6
-MISC ChangeLog 2950 RMD160 7d3e10d3afcfe9ec14f629e390a02134c3a0bde7 SHA1 a39c794d4a8090483977c1b316f908ee62924bd1 SHA256 9f5db3f57cd6b665c7676a95308fcaef882c076357b7160300aa55ed3ac65052
+EBUILD HTTP-Daemon-6.10.0.ebuild 799 RMD160 2f7c8bbfb9521a837416b50789c032be6003f2ff SHA1 95609ef780fb0131416da9dd7db636c759b3a48f SHA256 4dd4d55e7c810c26f4c10272b3f9d23c183b990df7fe8e8c612aa2c8e18099a1
+MISC ChangeLog 3057 RMD160 a35570859e3c5fd54d58dd9de81b2380311da7c8 SHA1 71b0a6a975b408f11ad2b7eb74b9c2bcdd2bbdf6 SHA256 08fce66e0cd19336fc5986d80a4a821767495e107e0bad150c08f1ad82a4a24b
 MISC metadata.xml 358 RMD160 cab3c2d43349d724ec0e29bed5e5630d5b6caab0 SHA1 16f727cc5d09cf6901feda1db3ea3902dbea3b79 SHA256 9cda50631cd6b6748cbc2faa2261a7bb1cb3101ed544909ae056885166b2df19

diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild
index db93bc8..1006df7 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild,v 1.6 2012/06/22 15:50:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Message/HTTP-Message-6.30.0.ebuild,v 1.7 2012/06/29 14:57:15 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Base class for Request/Response"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/dev-perl/HTTP-Message/Manifest b/dev-perl/HTTP-Message/Manifest
index 27c7ac0..25529d0 100644
--- a/dev-perl/HTTP-Message/Manifest
+++ b/dev-perl/HTTP-Message/Manifest
@@ -1,6 +1,6 @@
 DIST HTTP-Message-6.02.tar.gz 49243 RMD160 6703f508af52ba7d30a1a3362c0f40f8a01af20d SHA1 8622a3ac18c39c3594ff42a330ceb65ac6c91c43 SHA256 2331b3c82e8a9674e596e4583f13a655d24d2e3c7165f3bdc6def4b5d4165181
 DIST HTTP-Message-6.03.tar.gz 49711 RMD160 2f2eb59852ad040d59936c6f1293d0022971c6c2 SHA1 ffd90daf91d07b0c58a3ec4544c79416d4968ebc SHA256 c736e083bdf0eea1bb73e2dc3b66db0a8283942c0f69063afadb9a7cfa80011b
 EBUILD HTTP-Message-6.20.0.ebuild 933 RMD160 115881a7a63e3edb1384246c97584c6168e1100b SHA1 ff7bace3e9c94840438900c51b3512ec67561efc SHA256 4077963792ee94340160a8b44a8b79235281bb70b945ecab5844bf88725147b6
-EBUILD HTTP-Message-6.30.0.ebuild 962 RMD160 51c5bb87cc4cb120e5b6cfee23a8567a4774cd8c SHA1 5719b2a48fdcd0b57facddaece039174b6e3b93c SHA256 8651f32957a2dc85bda09bc50598bb62237d5cc50f5cf8689ef3d636cc039fd2
-MISC ChangeLog 3206 RMD160 96f4ee2924260f6043da4fb6246c08b5891edcf9 SHA1 2f77baba35d2522ea2ffe88f5940063b81ac3841 SHA256 be7ef30b6e05534566c7961476fa4388f0b0b2bcf2c1f663dc15b0be0caeb52c
+EBUILD HTTP-Message-6.30.0.ebuild 958 RMD160 81315f3b6edf0472bc671e403840092781f3346a SHA1 c411da7d86935e941c6e8bfc7c672bce06974d71 SHA256 5872e07cb3826ecb015fc81d7dc0f168a921ba8fe5da0818cb2fc65b45c42620
+MISC ChangeLog 3314 RMD160 cd834f606d2f11615967ecf70f19af552c657830 SHA1 d2ffa135331ed10ce0ad6616db643b9e6c515269 SHA256 902351bb04d9360ec2b783bfcdfdd44f2160819dc7d35b9c9241f5095da784ba
 MISC metadata.xml 838 RMD160 4247aaed5a02dbb7e1880818acdefbe52ba7974f SHA1 003194a4ca9ef9e1642966e5bd4e08f2f976730f SHA256 2418ec8a8bcbd23c07ba5f399542b96e456f07fc06ab3765583b62712d62ca96

diff --git a/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild b/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild
index fb6e444..98d3360 100644
--- a/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild
+++ b/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild,v 1.7 2012/06/19 14:01:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/IPC-Run3/IPC-Run3-0.45.0.ebuild,v 1.8 2012/06/29 15:45:05 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Run a subprocess in batch mode (a la system)"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
 
 RDEPEND=""

diff --git a/dev-perl/IPC-Run3/Manifest b/dev-perl/IPC-Run3/Manifest
index 2f1a3b6..25105ce 100644
--- a/dev-perl/IPC-Run3/Manifest
+++ b/dev-perl/IPC-Run3/Manifest
@@ -3,6 +3,6 @@ DIST IPC-Run3-0.044.tar.gz 19412 RMD160 fc3a3a5855bbfbe79943d2976f3390e57f5a02ad
 DIST IPC-Run3-0.045.tar.gz 20017 RMD160 0b5f471fde0966583dba8759b47e533c054aa41d SHA1 d5bdab13354071de5bd6cd4d78a6822cb525e436 SHA256 658971b13f837c9c760df1959ac6471d5e48265d0a44d1d524cb4d0ab81881da
 EBUILD IPC-Run3-0.043.ebuild 605 RMD160 2fa54cfde9fb7cba910d1ccb3aacdaf27eed830a SHA1 5a2149ad0bfe3167219bdafbcbdd5a4bd8e8b103 SHA256 1ea7301e8822b57ace4c46cc847071c6a8f9918bd6fb1a127889defa0284194a
 EBUILD IPC-Run3-0.44.0.ebuild 659 RMD160 2883690bbf2ee634768ab5c4b648938971b91db1 SHA1 e70f46e1ff1a7d886679b570033269169c21b7cd SHA256 508f1ab1bddd84e81e07557c58396f2be0a7f8f66f13dac441ac7a5a30876741
-EBUILD IPC-Run3-0.45.0.ebuild 665 RMD160 351fab50f684abed9e444fe745255737735d17bb SHA1 5bf7d2233dd540393803be41327f9e64636d0c5a SHA256 ebc41fc80277c5ff617801d7a55c6457988bc15b8f1a6eaa74e927d702c9a599
-MISC ChangeLog 6442 RMD160 d76fcc711641177493b78a0cef7ac45fa0351164 SHA1 919ab846b08c0681c5397ede8c52197337c457cc SHA256 ef3028c81d0eb7cbbf22ec5f655e3efa2e95e0ac8ad57a3b48da42c3f6b73750
+EBUILD IPC-Run3-0.45.0.ebuild 664 RMD160 dcd46dbe4a663caa0037b68dc18c76d906fae40a SHA1 00ad76bed81468a0a32cc626c6037171698f1c62 SHA256 aa04bf625340afc5f5ce50748ea014f8ddedfa37f11e0d7bc8068b7ba4daf9c1
+MISC ChangeLog 6546 RMD160 4a37da3eac0754aed185208e6f93e008ac8ba5da SHA1 0d3776a5af617a31818a91ad3bab64efe7008ac6 SHA256 df3c7e55bccbbfbc00bdcdf38e6819bee1800516df362fd5dfcea669b665375f
 MISC metadata.xml 290 RMD160 570c05297a26bfa6ed83f8de4030e2b3319f01ce SHA1 504a4f4531023b754a51b114fee6b92f54ddef85 SHA256 0f32cea252a74b3305b2fb5a082323be8265d34346c6e65966bfd3b3d8dfea96

diff --git a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild
index 9788ee2..69fedf1 100644
--- a/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild
+++ b/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild,v 1.6 2012/06/22 15:51:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/LWP-MediaTypes/LWP-MediaTypes-6.20.0.ebuild,v 1.7 2012/06/29 14:59:34 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Media types and mailcap processing"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/dev-perl/LWP-MediaTypes/Manifest b/dev-perl/LWP-MediaTypes/Manifest
index b1b9e96..c320541 100644
--- a/dev-perl/LWP-MediaTypes/Manifest
+++ b/dev-perl/LWP-MediaTypes/Manifest
@@ -1,6 +1,6 @@
 DIST LWP-MediaTypes-6.01.tar.gz 14917 RMD160 2ea782c0da693951f1614f3a5f74d63e505368d6 SHA1 b794d54a4f8c36ee51b28987bfc1abc33be5561d SHA256 df25a848796bb53ae465924fb1192a19400f37d7446b2fe7f73443db07c51dba
 DIST LWP-MediaTypes-6.02.tar.gz 18722 RMD160 a99f980361c58b1fbf5f130964a213076a32c1fe SHA1 f56891f4e718a5f1f16f09ae37d32e454095cbed SHA256 18790b0cc5f0a51468495c3847b16738f785a2d460403595001e0b932e5db676
 EBUILD LWP-MediaTypes-6.10.0.ebuild 667 RMD160 2b174674234fee895c0872ea6bde05bcfb18311d SHA1 e91f24ff3de48939110c55d9dc067469339c2329 SHA256 434afc7f277c5df8976a7ccb146efc5709810b79626997ce81d8743e451700f8
-EBUILD LWP-MediaTypes-6.20.0.ebuild 696 RMD160 570d4e7e48d76d6df8a8f01ac80621506b53aef0 SHA1 718b8ebd1a80d0f13900326d43d4da1b76e669e4 SHA256 ae08b8c845b4bbbef387d490adf453a5e390c238840bf71b0fa447be6eb8278d
-MISC ChangeLog 3047 RMD160 27f9a87928227ff5df49429ab3317598fbab85de SHA1 2c2bad4bda7d51e15d6163e2e61632f7a560f70a SHA256 6d815f56c382a3052d366e96f21416d6e92af42b34b4c86a8b71c068d37ec4af
+EBUILD LWP-MediaTypes-6.20.0.ebuild 692 RMD160 116cf449d59dbce0a27ab97d7278707216a3f549 SHA1 e5b2b9f8e92cd8f858d7d8c4d952a8cef5f0c6fa SHA256 9fc7b9695e90b330b4ef210cb9337f41d5a9074bf8a62e1a95ce0c39e4d49d15
+MISC ChangeLog 3157 RMD160 088efe78e06492fce3f7ab3c35b2bf4ec6cb3948 SHA1 98d4a8b9b5e2be06a6eb9c60e23618401fdda2af SHA256 73248259564847be2199a91e9da5a4b4f924782ff9590cb90eff24485e66071b
 MISC metadata.xml 295 RMD160 1099f649fc917640111e89ec6a8e207cedf3ee3a SHA1 afbc310930d9240032dbb05f9835d97344a09844 SHA256 195f4011e12c7ed34367248641d196bfd3918c5f808bd09fdd26fb84d058a207

diff --git a/dev-perl/MogileFS-Utils/Manifest b/dev-perl/MogileFS-Utils/Manifest
index b92cfef..7c3d7ab 100644
--- a/dev-perl/MogileFS-Utils/Manifest
+++ b/dev-perl/MogileFS-Utils/Manifest
@@ -9,6 +9,7 @@ DIST MogileFS-Utils-2.20.tar.gz 38524 RMD160 55c8313caf8686b1a95884bbbdb9501ad38
 DIST MogileFS-Utils-2.21.tar.gz 38662 RMD160 ad97fa43905be987e5e1036fd2cc62e2aca2b1b3 SHA1 5d12d8fd03fd2bb466186d52a9cabc5053e7a7ec SHA256 346c37ce6525596c1c48a220c26b4bf855dedb4498c344db99e1476f7a4489e3
 DIST MogileFS-Utils-2.22.tar.gz 39361 RMD160 0384a698d405d6afcf70e3a2a5c5a1eed2568e5d SHA1 55ca7412f5c05c0160f8841eec029babb9088329 SHA256 c1fc4cc8d2d689fbcf6ae323c42cfe1d6785f374a586a9a6a01f1db78f02b90e
 DIST MogileFS-Utils-2.23.tar.gz 39660 RMD160 4edf3bf9872299adec3b584181cc194686cd8343 SHA1 bfd787b269248a5d8491acdba12ee8f7430dcf4c SHA256 2b6ef41721e8ccfcfdfba115794b00f1469b51d0f1b7ae2a373c4cd20e0dbff8
+DIST MogileFS-Utils-2.25.tar.gz 40055 RMD160 e6a8061af44ad02b4f1c5c7f1129a43228a526e7 SHA1 127d4493a9ddc2aa66792021cb61d1abc5b3ab57 SHA256 c688e56ea54e2fd93a6a7cafa7b66d98fb6e2be3a69055402165fd50cefa3ede
 EBUILD MogileFS-Utils-2.13.ebuild 526 RMD160 7cca80e3f040836cc179b68592a9731356a8f155 SHA1 ff6ffcc7973fda51ef5b9b57e3f16cbef06a5381 SHA256 13164d4882b5649d1f8d2e113bf3207c288f13856aaef0b829e68aa7b5f6d6c0
 EBUILD MogileFS-Utils-2.14.ebuild 526 RMD160 d9e367768ccc5b8dd898c642a2c58524c1c912e5 SHA1 5c025f3f72221f280e4ad2e2d09670d32c6818a5 SHA256 a2c2884b01a6bf3cb5a6147ca51a2caf9a356a4ed633b5bf2553a8318c5abcd8
 EBUILD MogileFS-Utils-2.15.ebuild 529 RMD160 d951a8c6a19cebf87330e207a4a97c6b47757988 SHA1 4426671056e04e3e7905aebb6475827919b15b08 SHA256 b329ca236016c971c3dd86c1dc79640a7549d8f96697b9b431c63a5957cd8cf4
@@ -21,5 +22,6 @@ EBUILD MogileFS-Utils-2.200.0.ebuild 536 RMD160 311449bc1409887f799294bdd6cef366
 EBUILD MogileFS-Utils-2.210.0.ebuild 536 RMD160 534e3ca29b9f9e64fef6af28be196d2b9739032b SHA1 b03d184c72179b378f6262a610755f0d14abe92d SHA256 c700f6547f7d51b4b65ca32c5518bec861e94c9de12ca9cdeec8abf8c235dbb7
 EBUILD MogileFS-Utils-2.220.0.ebuild 544 RMD160 6073f416dd464fa6f0c58465ade20320b9244464 SHA1 241e58b8750adf1d92041f5df6f915cfbc649620 SHA256 0f158f9d0704329344dbcf8ce80f47283b03a862b8f584592d73d1cc96554871
 EBUILD MogileFS-Utils-2.230.0.ebuild 544 RMD160 d4daeca3ea504f48de7aa149e5c1aad549f9b958 SHA1 9928dc8795b0825d367dc585a14247f44b69c41d SHA256 0c3641be82c45f3fb9d08971cc90456387c0dc8b9c52c9b954ac2568eea2a765
-MISC ChangeLog 3540 RMD160 ee71fcbce473473d020ef986e469f761084b942a SHA1 6c86c9db3b30f0dd5ec6d4e5506efbeee5ef650e SHA256 ee8a960a33e2a7fa53b38ce68188c0c747038440795a8de03f936e4ba1ff6fe4
+EBUILD MogileFS-Utils-2.250.0.ebuild 544 RMD160 abe695afb4af0ac8fb9ccf625d006d4070b03a68 SHA1 c8b81fd9f1a49a2c09240146d5455d71106544df SHA256 a9a637a4b25de2cbd4dfabc7a302894a6663a8ede873210fba9f211cd3298c31
+MISC ChangeLog 3718 RMD160 906c9d10100e77b65be3f99e07c9a840d70bc8ea SHA1 f6adf166db50536012a5c8f68bf5ca5150075dc1 SHA256 4181ecfb94856e91a6c68445ce79cdca35e13cc96e5781b8bafdbbcaa78df562
 MISC metadata.xml 421 RMD160 8cd2392aa5340fa9f1ac5e5d10bf576a2170c9e8 SHA1 969956ab95d50dd0c453ab831b19312c3a55b710 SHA256 29aa7b951be85c5ebe81dee3e265044068d66ce252203954561d5c2d8f243d99

diff --git a/dev-perl/MogileFS-Utils/MogileFS-Utils-2.250.0.ebuild b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.250.0.ebuild
new file mode 100644
index 0000000..f9b5156
--- /dev/null
+++ b/dev-perl/MogileFS-Utils/MogileFS-Utils-2.250.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MogileFS-Utils/MogileFS-Utils-2.250.0.ebuild,v 1.1 2012/06/29 17:09:40 robbat2 Exp $
+
+EAPI="4-slot-abi"
+
+MODULE_AUTHOR=DORMANDO
+MODULE_VERSION=${PV%0.0}
+inherit perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="virtual/perl-IO-Compress
+	dev-perl/libwww-perl
+	>=dev-perl/MogileFS-Client-1.16"
+DEPEND="${RDEPEND}"

diff --git a/dev-perl/Net-HTTP/Manifest b/dev-perl/Net-HTTP/Manifest
index dfc1679..11a2b23 100644
--- a/dev-perl/Net-HTTP/Manifest
+++ b/dev-perl/Net-HTTP/Manifest
@@ -1,6 +1,6 @@
 DIST Net-HTTP-6.01.tar.gz 13733 RMD160 156670bd93ce465d7a9d2fcac685820e4708f252 SHA1 ffefc52e4e171d2b578a6e50d2fd29ea71fcdbe8 SHA256 76d883f9b249b16393dc183de04b4e4fed99bb0eb776ab9149d915607c69ea46
 DIST Net-HTTP-6.03.tar.gz 14294 RMD160 20a4e7181084820b49bda56d3cf13cd167c61924 SHA1 efb374a53aee9f9f68aed98f98ef60ac18d56078 SHA256 ecb0236dc23dccdc92e4b1c2dc63b2a2e29ac3a4a1f50104a838279a72a8a0ab
 EBUILD Net-HTTP-6.10.0.ebuild 741 RMD160 3d2fda9efe075ca99367eccd88dbb610badac9e5 SHA1 fa87a50594cf9b576f1ca2ef7d3de0addc3f0efe SHA256 340da349009cb96470d203b76c714052201e1dcb436da0e34904f352b9a1f8be
-EBUILD Net-HTTP-6.30.0.ebuild 758 RMD160 2434eeb2ac662968b11c489d486ab3548acfe8d1 SHA1 0c8b5e29b269dbcd71f73fdff09807df6b62e8d2 SHA256 e4e7efc06c619ddfa329494d1144a89f4435e65986e05d49902517d5074d41fe
-MISC ChangeLog 3433 RMD160 49ee4d5757c945cf1ab26c1f015bc804ac8023d4 SHA1 4be407ec181a66c755130559f4135fd46bfc8462 SHA256 dad6704cff029b3fa52daad08fcc1b482da29f2e6c8df90c2ed64f49a491dca4
+EBUILD Net-HTTP-6.30.0.ebuild 754 RMD160 f65291699dbdca75c334104d3d4228f418f5b44a SHA1 8f2262240398e753183bfd40880c395df5f03232 SHA256 fb9a797cbe9b335644f0527920a1c0f59301963ed47331c15be5a4e2467d405b
+MISC ChangeLog 3535 RMD160 2d16b04704a81be42d32abe6e77389755fb29649 SHA1 516ea5c84bed4bf721387077ca6dbd3b2989045f SHA256 75e53b0dd9de58f64bbb5c5d9f939f34fd91e5ed67315327199377bb36f0f1d1
 MISC metadata.xml 459 RMD160 832d156b220044e7f28a7b88480966bd25dfa553 SHA1 c904e6a47cfb4af933f3257495976570705a3a99 SHA256 5f698e52527e5110e96398c41780e4611f2a5b939e1a7f18aeed0c4b329c7efe

diff --git a/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild b/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild
index 344afc9..56731e5 100644
--- a/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild
+++ b/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild,v 1.7 2012/06/28 12:33:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-HTTP/Net-HTTP-6.30.0.ebuild,v 1.8 2012/06/29 15:00:12 jer Exp $
 
 EAPI="4-slot-abi"
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Low-level HTTP connection (client)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="

diff --git a/dev-perl/mogilefs-server/Manifest b/dev-perl/mogilefs-server/Manifest
index 11181f5..2fb7f02 100644
--- a/dev-perl/mogilefs-server/Manifest
+++ b/dev-perl/mogilefs-server/Manifest
@@ -21,6 +21,7 @@ DIST MogileFS-Server-2.60.tar.gz 166840 RMD160 8194f2e652a6348c49f11ae5f684baae9
 DIST MogileFS-Server-2.61.tar.gz 173555 RMD160 9e762a23b0614219a269c0ffbe6f5d5a40217a2c SHA1 cf0b17191e4ea1fc858dbc943a0e47a0a5407d34 SHA256 c3a92c7b1006ce5e0b41875b716ea0049585360195abc61125d2756ddfaaf8e6
 DIST MogileFS-Server-2.62.tar.gz 173736 RMD160 1f08b5e313ceaa8c666d58b9e2fc28dfe28d9dc5 SHA1 2147eb1a12e13fd51f4118c4bbb0a163d22ae0e6 SHA256 1585dbaa20260fcf0cd2fe3cfc40588cbe064e51ad102da13b12a0f2bfc1ba39
 DIST MogileFS-Server-2.63.tar.gz 173793 RMD160 ed77f8aa19b986d87af4553b7c7a32dae81e0473 SHA1 8cc2a2098bd21a029a352f0445e8906cd11aa25e SHA256 d090fbe9858afac95a57c3a14ca06b112d56ba55a6d9ec9ddf284b4216961c98
+DIST MogileFS-Server-2.64.tar.gz 175482 RMD160 356edb5b392af71560be04827aaa4882af73ad2d SHA1 c22d5ac2392d36b00edc03439fa085f842bacbbc SHA256 8361dea97b71503be2d055679f01e8b2305247e247f88961be67921a2a380a13
 DIST mogilefs-server-2.37.tar.gz 267909 RMD160 a6e25bb945770bb6a1d395620a277b7798c77b39 SHA1 d4b0f4177e6401bab6676725edaad66baea47d3a SHA256 1fcac070057c54599b99c2836b5ff157fd8433a1315363949b2f0d601c114ca6
 EBUILD mogilefs-server-2.37.ebuild 2687 RMD160 601596595caef5c4cf30cb9f70203e6b52426cda SHA1 bc83bdbfa3cc95542b4a278c8e3c02c0e8ae19ee SHA256 1e0f1edbc0d31315f041f13bb39f767a588ed5cf00b46821cc752048dce1a933
 EBUILD mogilefs-server-2.43.ebuild 2710 RMD160 a1f551583731337c1ad0f733d0fbb17a5429e828 SHA1 2d6502e76a4a2f53c1b08ad237f437a25bb4b7bf SHA256 7d7306856946e357ce92dc1c784100dfe75ab258ecb6db6acfb5418309663bfb
@@ -39,5 +40,6 @@ EBUILD mogilefs-server-2.600.0.ebuild 2736 RMD160 6cd3fbf9a918a431515c6df2affdae
 EBUILD mogilefs-server-2.610.0.ebuild 2736 RMD160 2726da40c12ea86ef386d9850714dccbdd99f428 SHA1 9f54f27eced98d901ee7f2366116251e8e40b18d SHA256 6619f4457c4e449dbd8cddf67449763654c632bc3e0904ae29a021eff806b4b5
 EBUILD mogilefs-server-2.620.0.ebuild 2736 RMD160 d60437fc710425564b052a7372b0c8999b3f0f17 SHA1 1d3192706d45957a86b47237db455fa58ef98960 SHA256 b8edae6128b171e9473027006c9e8c474ec794cb76e14bec47d5124a0a4b861c
 EBUILD mogilefs-server-2.630.0.ebuild 2736 RMD160 d6ebddb6dc36b6dff8f1b0d13a27044cb43ab254 SHA1 c1ebbf4eaadc7a2a786f47254243c1a2f3cee751 SHA256 bd92adc48111c0a9a03b9f2466da5ab448bb810ded489aaf8d09599ab007ccf9
-MISC ChangeLog 8125 RMD160 d718be5413c0a84fd1aeeb787942bfc5c220a9df SHA1 e4964b647edd5b004908caf224b0167dbb985193 SHA256 75e517799de71f4683a05de8e11df4d87c35ce64bf2c1e28a07e08d1fc075cb7
+EBUILD mogilefs-server-2.640.0.ebuild 2751 RMD160 b8e5140b2eda3049625494f0d535e454abf66ba6 SHA1 687b80f3aee2dfc0665f9e2ed55f84edfa8d3e47 SHA256 4161d03ec5cac9585df4c178a90b58110d2fa6eaf5dba2e4eb2996c3e3859cb7
+MISC ChangeLog 8305 RMD160 6fb5d77eec99e21392debb652d6ca36e727dfbc6 SHA1 79c3112f0c99d7eac1a8e59ec6742bda0fa2e0a1 SHA256 c9ee394de2f3008a339069223a9257c7095cc7a180bbcf67c35c607814babc92
 MISC metadata.xml 4487 RMD160 77010fcde5781f874192df619b5df461f616d665 SHA1 34c041e38b58dd9bf83e07c86426af2eda01f588 SHA256 9a54426e420739779a643845bf77522204df2462a75c0c6c0415cb7c7f73f5f4

diff --git a/dev-perl/mogilefs-server/mogilefs-server-2.640.0.ebuild b/dev-perl/mogilefs-server/mogilefs-server-2.640.0.ebuild
new file mode 100644
index 0000000..4a8dc74
--- /dev/null
+++ b/dev-perl/mogilefs-server/mogilefs-server-2.640.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/mogilefs-server/mogilefs-server-2.640.0.ebuild,v 1.1 2012/06/29 17:18:03 robbat2 Exp $
+
+EAPI="4-slot-abi"
+
+MY_PN=MogileFS-Server
+MODULE_AUTHOR=DORMANDO
+MODULE_VERSION=${PV%0.0}
+inherit user perl-module
+
+DESCRIPTION="Server for the MogileFS distributed file system"
+HOMEPAGE="http://www.danga.com/mogilefs/ ${HOMEPAGE}"
+
+IUSE="mysql sqlite postgres"
+
+SLOT="0"
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+# Upstream site recommends this,
+# but it breaks Perlbal
+# dev-perl/Perlbal-XS-HTTPHeaders
+RDEPEND="dev-perl/Net-Netmask
+		>=dev-perl/Danga-Socket-1.610.0
+		>=dev-perl/Sys-Syscall-0.220.0
+		>=dev-perl/Perlbal-1.790
+		>=dev-perl/IO-AIO-4
+		dev-perl/libwww-perl
+		>=dev-perl/MogileFS-Client-1.160.0
+		>=dev-perl/MogileFS-Utils-2.250.0
+		dev-perl/Cache-Memcached
+		mysql? ( dev-perl/DBD-mysql )
+		postgres? ( dev-perl/DBD-Pg )
+		sqlite? ( dev-perl/DBD-SQLite )"
+DEPEND="${RDEPEND}"
+
+# You need a local MySQL or Postgresql server for this
+#SRC_TEST="do"
+
+#PATCHES=(  )
+
+MOGILE_USER="mogile"
+
+pkg_setup() {
+	# Warning! It is important that the uid is constant over Gentoo machines
+	# As mogilefs may be used with non-local block devices that move!
+	enewuser ${MOGILE_USER} 460 -1 -1
+}
+
+src_prepare() {
+	for f in Makefile.PL MANIFEST ; do
+		if [ -f "${S}"/${f}.orig ]; then
+			cp -f "${S}"/${f}{.orig,}
+		else
+			cp -f "${S}"/${f}{,.orig}
+		fi
+	done
+	# If we are not in a cutting edge Git source, we would prefer to not install
+	# duplicates of these.
+	sed -i -e '/directory.*mogdeps/d' "${S}"/Makefile.PL
+	sed -i -e '/^lib\/mogdeps/d' "${S}"/MANIFEST
+	mv -f "${S}/lib/mogdeps" "${S}"
+}
+
+src_compile() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_compile || die "perl-module_src_compile failed"
+}
+
+src_install() {
+	export MOGILE_NO_BUILTIN_DEPS=1
+	perl-module_src_install || die "perl-module_src_install failed"
+	cd "${S}"
+
+	newconfd "${FILESDIR}"/mogilefsd-conf.d-2.16 mogilefsd
+	newinitd "${FILESDIR}"/mogilefsd-init.d-2.16 mogilefsd
+
+	newconfd "${FILESDIR}"/mogstored-conf.d-2.30 mogstored
+	newinitd "${FILESDIR}"/mogstored-init.d-2.50 mogstored
+
+	newinitd "${FILESDIR}"/mogautomount-init.d-2.50 mogautomount
+
+	diropts -m 700 -o ${MOGILE_USER}
+	keepdir /var/run/mogile
+	keepdir /var/mogdata
+	diropts -m 755 -o root
+
+	dodir /etc/mogilefs
+	insinto /etc/mogilefs
+	insopts -m 600 -o root -g ${MOGILE_USER}
+	newins "${FILESDIR}"/mogilefsd.conf-2.30 mogilefsd.conf
+	newins "${FILESDIR}"/mogstored.conf-2.16 mogstored.conf
+}
+
+pkg_postinst() {
+	chmod 640 "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+	chown root:${MOGILE_USER} "${ROOT}"/etc/mogilefs/{mogilefsd,mogstored}.conf
+}

diff --git a/dev-perl/yaml/Manifest b/dev-perl/yaml/Manifest
index 2b1d13f..1bef35a 100644
--- a/dev-perl/yaml/Manifest
+++ b/dev-perl/yaml/Manifest
@@ -9,6 +9,6 @@ EBUILD yaml-0.730.0.ebuild 643 RMD160 0c34f12936734344665a092c30521523d9840914 S
 EBUILD yaml-0.750.0.ebuild 641 RMD160 de52f9de0cc8a4bfd06ad768e823a19bfc8070ac SHA1 aaa56c98c92f261828d92b87d701b2e6cd667721 SHA256 d9db92d67e06be188b69bdad0e200f1c2cfe47ad31ba2f8b1d17c9d39fab2487
 EBUILD yaml-0.770.0.ebuild 641 RMD160 e3b6783b6aee46da2dd90b4237bbd277f4794191 SHA1 5ed9d6eb71302c5d9c3b07e851ca2a10dce15252 SHA256 d1f4f8ff773eb04a9539b02795d4e717f09b5747c5a3dd6d847069c07ecbcade
 EBUILD yaml-0.800.0.ebuild 641 RMD160 f20323250edeeebb9ce5d02d4c749a78d9ac8f4a SHA1 9d8d8d04a31bbef9fab92dd80d838cb8a938c29e SHA256 80745b5c38466dc372ea8e3fe02a25e982612d7eb0851b3d0af67e29b91b3243
-EBUILD yaml-0.810.0.ebuild 641 RMD160 a291080cfe5a3676cd9c4b050e65e79eecb9264c SHA1 6ad955beb09520eabc57053c91099c1dd92f1c49 SHA256 7c5dbb75da20509132a6d6c90b752f32f86dfb965c0c884d06a1d0a2e07c60da
-MISC ChangeLog 10361 RMD160 d7b6ddbe8b283f6e6b2a7bb106311921501b968e SHA1 4a5eb8bbe35a914537fa97475496b6576bb19e5b SHA256 0cf7bdd3c9c482606aa8a94ab2ab71c664640a4039cb3688020c29644fb3386a
+EBUILD yaml-0.810.0.ebuild 639 RMD160 fce7bb49f5ea323a6607081ef7cc856f56d7e069 SHA1 767b6e65a907d9fae26bca26fc0ffea29644db1f SHA256 d4ce6085b44a6b2e5ff16dcd971617064efaed683018cc5f66cc63fea6fc47be
+MISC ChangeLog 10567 RMD160 10a7e16aa3cf17ddfcaf3c54327b7a2bb5965aff SHA1 0a20b57c436d66644e26eed36f7013a6888451cd SHA256 df11ac43b06009b737a34b67a6a31713f29b273c0f61b1eeba8727cbad0b327d
 MISC metadata.xml 1672 RMD160 9526f430174fe872e13dd06e0f5ff385423816af SHA1 935adb9a210daea3b18507d1b3584d16fff5a4c2 SHA256 3182132352695bf59ed0d2df7f59e049d1b26faa75a2cd7e70ca2fe32134fd42

diff --git a/dev-perl/yaml/yaml-0.810.0.ebuild b/dev-perl/yaml/yaml-0.810.0.ebuild
index 1c85373..39a78e5 100644
--- a/dev-perl/yaml/yaml-0.810.0.ebuild
+++ b/dev-perl/yaml/yaml-0.810.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/yaml/yaml-0.810.0.ebuild,v 1.3 2012/06/25 07:09:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/yaml/yaml-0.810.0.ebuild,v 1.5 2012/07/01 15:47:52 hattya Exp $
 
 EAPI="4-slot-abi"
 
@@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="YAML Ain't Markup Language (tm)"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"

diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 64f4de8..ab8ab32 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -2,9 +2,7 @@ AUX graphite2-1.0.2-no_harfbuzz_tests.patch 551 RMD160 716d3a068e30aa42074d593fd
 AUX graphite2-1.0.3-no-test-binaries.patch 620 RMD160 ccd578085925a33d0cf59be6ae710d52e496f0ae SHA1 e4227456d3159b125c65a38feb737a3cc4b7c875 SHA256 c51a69ed5e8ff6301d35aa97ca585aec6976d2ee3d7715c0fb04684dd0151660
 AUX graphite2-1.1.0-includes-libs-perl.patch 685 RMD160 4cc4d60919f48cedc43cfe7ff181e53809b88aa7 SHA1 6dc156b4d934a90dde8f3bbf0a53cc769f4010e3 SHA256 da7a24551fa9029214a909ae6a49070c12f889eae287ce2c392555b0299db32e
 AUX graphite2-fix_wrong_linker_opts.patch 760 RMD160 d471cdcf96a027c37409a5430a87549f1cebf46b SHA1 3ad5d80d27afec6fb0d0fae7e49c26f3f0b37967 SHA256 95c943e57043f7368c44e1cd5fbadd5fabeb91ba4799072d1ffc2ef8d818454d
-DIST graphite2-1.1.2.tgz 3677920 RMD160 389819c589a448d68626356566768dee39a451fe SHA1 afc07f4afd9aa4a2f8ac37bb7178635fd20dc9a7 SHA256 3e96d503bd8014b5ea06741487f5db2aab2d5785d43aa046c7d6de74e1b24f87
 DIST graphite2-1.1.3.tgz 3680838 RMD160 f6858b233753020b83624fe5c8b3e98c3ea1802b SHA1 f5612a5009e52e388eb1f31c692f3ce6bae78209 SHA256 0eb19282a1941bdd5e6d7165718c5d4692d62bac6c1eea56d9e522715cb144f7
-EBUILD graphite2-1.1.2.ebuild 1927 RMD160 e0bb08b81c5244f6f22557f3f6215a6b1a26e68d SHA1 b41ee0ea08447b859300fd3463ba209a4f8f2826 SHA256 12c080bcfe60a79ab9d5141eb6d6e147022f39e6ae4d1a6e8315acad735770e6
-EBUILD graphite2-1.1.3.ebuild 1930 RMD160 87890e5008e6ccd62e9b7671a6e4661126a0b2a1 SHA1 870e02e3f1eefae8f16fd4c1b471c8ddc8d3249b SHA256 b1ff1d92c0923d2d3cc5b8493a732545123d36815c34a8c99eede3931d35e84a
-MISC ChangeLog 5703 RMD160 0cb018a398615d177e752a367c9f0d675caf1a55 SHA1 348f9af312829604d8d5d8f5254c8535e73829ca SHA256 8cb17ac7d80444f706416148b758bf008b99626c3ad56f83be6dc2885f2414b7
+EBUILD graphite2-1.1.3.ebuild 1954 RMD160 cba1d352357febf3ca8cb143cac6020bbbbbd684 SHA1 fc3dfb3f08470055b18b9fc760a749405acc2589 SHA256 b0f42ba2610c66d319119fbd98770b4b50a9884a3ff9469acd181a43b3dd4434
+MISC ChangeLog 5864 RMD160 f97f49f029ef2f1107c494ae7fd5ce396ad5a12a SHA1 d54e35527e253ba37deb4c71477e843a84087649 SHA256 2d31bc7f5df390d8806b62b2358e68b174ec2f6f05af174c7edfd64fb4d72e32
 MISC metadata.xml 163 RMD160 68888b3756b2cf14b88ff5aa31e4fd07c9cc9713 SHA1 bd3e6fae69f40f453bc382ae8f1a7644a590a9cc SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2

diff --git a/media-gfx/graphite2/graphite2-1.1.2.ebuild b/media-gfx/graphite2/graphite2-1.1.2.ebuild
deleted file mode 100644
index 87dbbe9..0000000
--- a/media-gfx/graphite2/graphite2-1.1.2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.1.2.ebuild,v 1.3 2012/05/23 08:49:11 scarabeus Exp $
-
-EAPI="4-slot-abi"
-
-PYTHON_DEPEND="test? 2"
-inherit base cmake-utils perl-module python
-
-DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE="http://graphite.sil.org/"
-SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="perl test"
-
-RDEPEND="
-	perl? ( dev-lang/perl:= )
-"
-DEPEND="${RDEPEND}
-	perl? ( virtual/perl-Module-Build )
-	test? (
-		dev-libs/glib:2
-		media-libs/fontconfig
-		media-libs/silgraphite
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-includes-libs-perl.patch"
-	"${FILESDIR}/${PN}-fix_wrong_linker_opts.patch"
-	"${FILESDIR}/${PN}-1.0.2-no_harfbuzz_tests.patch"
-	"${FILESDIR}/${PN}-1.0.3-no-test-binaries.patch"
-)
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	base_src_prepare
-
-	# fix perl linking
-	if use perl; then
-		_check_build_dir init
-		sed -i \
-			-e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \
-			contrib/perl/Build.PL || die
-	fi
-
-	# make tests optional
-	if ! use test; then
-		sed -i \
-			-e '/tests/d' \
-			CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DVM_MACHINE_TYPE=direct"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use perl; then
-		cd contrib/perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-}
-
-src_test() {
-	cmake-utils_src_test
-	if use perl; then
-		cd contrib/perl
-		perl-module_src_test
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use perl; then
-		cd contrib/perl
-		perl-module_src_install
-		fixlocalpod
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-}

diff --git a/media-gfx/graphite2/graphite2-1.1.3.ebuild b/media-gfx/graphite2/graphite2-1.1.3.ebuild
index 587c8bd..8296932 100644
--- a/media-gfx/graphite2/graphite2-1.1.3.ebuild
+++ b/media-gfx/graphite2/graphite2-1.1.3.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.1.3.ebuild,v 1.1 2012/06/14 08:32:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.1.3.ebuild,v 1.3 2012/06/29 11:54:55 scarabeus Exp $
 
 EAPI="4-slot-abi"
 
 PYTHON_DEPEND="test? 2"
+GENTOO_DEPEND_ON_PERL="no"
 inherit base cmake-utils perl-module python
 
 DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
@@ -13,7 +14,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="perl test"
 
 RDEPEND="

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
new file mode 100644
index 0000000..ccc6ee0
--- /dev/null
+++ b/media-libs/libpng/Manifest
@@ -0,0 +1,10 @@
+DIST libpng-1.2.49.tar.xz 538408 RMD160 75f27a3a8140767ce5a5cd3c4b77de48f376dc39 SHA1 0984ab46fbfa5a34ca8d98958eebe5fb52b22294 SHA256 6f5a313225ce8f0d36aceda25b837ad3cb97d0096a97fa23dbc6362f7781d014
+DIST libpng-1.5.10-apng.patch.gz 10127 RMD160 b44c3ee9560662f740b74773e8656c65c3a7c265 SHA1 89353426738f301cb5140c4323ee14480119ed57 SHA256 0464b2df97853c426f35f97d12800b4dcb5760fc4c787fc4987ae0fb870a997f
+DIST libpng-1.5.10.tar.xz 702752 RMD160 18875d71984f025e41bfa6bafadbe3ad0eb49eae SHA1 bfa655f04965545a54dc974e50c2325968ca5a71 SHA256 dd49c39710a6ef8a550923ba17d3496b08ce769e47122d9150df4763bf49605d
+DIST libpng-1.5.11-apng.patch.gz 10019 RMD160 09b0672a73a1cb285ae67401c83961636582e614 SHA1 f5533634a7b2ad1abfc0b99a678a90f283ce0ab2 SHA256 13c4153607dbf401378de4d0ba31bff044acffde176503b3dc1b90eed20281b8
+DIST libpng-1.5.11.tar.xz 705772 RMD160 749d686cf0c5ba59e56a967f452b47bc46eb306f SHA1 6a7eba0c6317f761380b822ff05bdcdeec769f76 SHA256 42d562714f0b6b8ead5b0aabfd8bca35e44993a572e0eae3e772cc180e59dda8
+EBUILD libpng-1.2.49.ebuild 852 RMD160 c90a63fa3dfcef7ead30565c1e379f8668ddbac3 SHA1 1080a850b1dc00f9d3778e0dd41121541dcda28b SHA256 6eec893f7f247d69e548bf7673849bc328905fc4f77a645d4d5c8cbb900373d3
+EBUILD libpng-1.5.10.ebuild 1586 RMD160 0166af1ee353a5208e4f80de75952c7f7ee0b3a6 SHA1 69dfdfd33b2a998d1cd6d4af10121087a769bf5a SHA256 ccf7fa5ccc8079b59b943cc5f6d15f5287a5726fc9430d5b161032eac5f8d755
+EBUILD libpng-1.5.11.ebuild 1325 RMD160 375947853b7195442d73d6cb30271ee15425e8e3 SHA1 7598e46dc7fe8de091af7a1194077da34fc4a5fc SHA256 b680af81516ea022aa4b1c4648cae4b2cbd6a2793778b54b37e9aa66c59961ae
+MISC ChangeLog 48466 RMD160 9beb7e2e363aca8148423405322f3c225381383a SHA1 187511d75e9a5dc38ee7f372824efcf088507c8c SHA256 cb0f21bfd5275ea6f5915a119112a0beb7c1d2f61d38cc07f66ff75b64d6a8c8
+MISC metadata.xml 247 RMD160 61ce1843d85a1ab05dc7838ac15375b0fb4f35bd SHA1 0a4b634f99126e9ebc485ad949b41df5a11f2fb0 SHA256 6646b71692ca41b7b944a2f6e044942baf8b8258ca073b555160e57b9eb39af8

diff --git a/media-libs/libpng/libpng-1.2.49.ebuild b/media-libs/libpng/libpng-1.2.49.ebuild
new file mode 100644
index 0000000..4f91576
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.49.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.49.ebuild,v 1.4 2012/04/04 16:01:32 vapier Exp $
+
+# this ebuild is only for the libpng12.so.0 SONAME for ABI compat
+
+EAPI=4
+
+inherit multilib libtool
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="as-is"
+SLOT="1.2"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips s390 sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	!=media-libs/libpng-1.2*:0"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	emake libpng12.la
+}
+
+src_install() {
+	newlib.so .libs/libpng12.so.0.* libpng12.so.0
+}

diff --git a/media-libs/libpng/libpng-1.5.10.ebuild b/media-libs/libpng/libpng-1.5.10.ebuild
new file mode 100644
index 0000000..7cc6cb1
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.10.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.10.ebuild,v 1.9 2012/04/28 18:59:10 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils libtool multilib
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/${PN}-apng/${P}-apng.patch.gz )"
+
+LICENSE="as-is"
+SLOT="0/1.5"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+
+src_prepare() {
+	if use apng; then
+		epatch "${WORKDIR}"/${P}-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable neon arm-neon)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN}:1.4 && return 0
+	preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 14)
+}
+
+pkg_postinst() {
+	has_version ${CATEGORY}/${PN}:1.4 && return 0
+	preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 14)
+}

diff --git a/media-libs/libpng/libpng-1.5.11.ebuild b/media-libs/libpng/libpng-1.5.11.ebuild
new file mode 100644
index 0000000..70d3ff8
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.11.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.11.ebuild,v 1.1 2012/06/16 15:58:39 ssuominen Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils libtool
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	apng? ( mirror://sourceforge/${PN}-apng/${P}-apng.patch.gz )"
+
+LICENSE="as-is"
+SLOT="0/1.5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng neon static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
+
+src_prepare() {
+	if use apng; then
+		epatch "${WORKDIR}"/${P}-apng.patch
+		# Don't execute symbols check with apng patch wrt #378111
+		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
+	fi
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable neon arm-neon)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}

diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 5d3b10e..787502a 100644
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -4,7 +4,7 @@ AUX ming-0.4.4-vasprintf.patch 6319 RMD160 88f106252808ee443c3fd4073828d97b75e3a
 DIST ming-0.4.3.tar.bz2 14098671 RMD160 38a495250c7f4ff3335ebd08df2984719a2f046b SHA1 e51a1c9de7efcd6b20f727a824cfbf323b6f5e6f SHA256 61480ef0bd911639ac0538bf59d4d5052a1380192d145e922720c33c40693bf0
 DIST ming-0.4.4.tar.bz2 14001112 RMD160 2070cd694b9a1ff8dd0a577df2f551d5d810e4fe SHA1 e803b3b94a00a361e3415105f26112cf6f7bac81 SHA256 40e09d781741ac961338ed8dec7ba2ed06217de9da44dd67af6b881b95d2af7e
 EBUILD ming-0.4.3-r1.ebuild 2437 RMD160 72c0c5f5974c0a9d6e39f5870a67384061d66fcf SHA1 c5f40818df9499bfce954889d0add6b1d921c6e3 SHA256 dc4abca69596e6f26a1616235a53f920571a4e29a8f27c7c30916f91d86955d0
-EBUILD ming-0.4.3-r2.ebuild 2501 RMD160 6e713b765105ec5bd7c20303de250e25127dfd8b SHA1 66d6a365364cc1f5ebac0abb3f24f39fae7f2818 SHA256 367d1ebd6b7d08d1b21c9fdaf54175a9ec797934a3fd7bceb7d3f34e1a1db59c
-EBUILD ming-0.4.4.ebuild 2512 RMD160 6301b5f88f8f56b0e2be69965b6c8b9460252e5d SHA1 592ff42da0ab728f3f453912cc9114264b771bfb SHA256 ce3bdc1b10abb817e4e078eed236e193e2507742c66243001b59483382d3960a
-MISC ChangeLog 12080 RMD160 3c9fb05f46c399a0907aa62f928b79e8d9f75ff5 SHA1 ea507715f1266ceb67becf238d6397b9f949a8ab SHA256 254e6adcbbb61b509a709aa70bd09eb11cb05413d6d65ab8ab932cff86ddebfd
+EBUILD ming-0.4.3-r2.ebuild 2497 RMD160 c2e1f18b4d400eb610c1f6c9bacdfde46bc76815 SHA1 c18df51d6fbe4d1de56390629d94db97366426df SHA256 e55e4c53cb23316733e9f9d936b64bf0e5e52da52d04b773397281f35a5ff610
+EBUILD ming-0.4.4.ebuild 2516 RMD160 f9f888cf8ddc605cc26c1253560fe3250de4251f SHA1 c0cb3bbf9476d6a1bd527774d4abf820d552bd8a SHA256 e8a6970a50ee4772bc902c8f4a98d0006f933883219a6080a5c7d6aef8ce3e3b
+MISC ChangeLog 12267 RMD160 ee793a1b5fdc35583cd02a256f83f07959fdf6b8 SHA1 297e0e85337a17e4918a7a7d686e4441103a50a5 SHA256 edd6ccbb1596406c7ed8dc620d1b1d74b31787c0fa35141e5c610c5c9bbbcc10
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5

diff --git a/media-libs/ming/ming-0.4.3-r2.ebuild b/media-libs/ming/ming-0.4.3-r2.ebuild
index 4aa240f..518f503 100644
--- a/media-libs/ming/ming-0.4.3-r2.ebuild
+++ b/media-libs/ming/ming-0.4.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.3-r2.ebuild,v 1.7 2012/06/14 06:20:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.3-r2.ebuild,v 1.8 2012/06/29 15:18:24 jer Exp $
 
 EAPI="3"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/ming/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+perl +python php static-libs"
 
 RDEPEND="perl? ( dev-lang/perl )

diff --git a/media-libs/ming/ming-0.4.4.ebuild b/media-libs/ming/ming-0.4.4.ebuild
index f1736e8..f40a1d0 100644
--- a/media-libs/ming/ming-0.4.4.ebuild
+++ b/media-libs/ming/ming-0.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.4.ebuild,v 1.2 2012/06/11 09:18:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.4.ebuild,v 1.3 2012/06/29 15:26:33 ago Exp $
 
 EAPI="4-slot-abi"
 
@@ -18,13 +18,13 @@ SRC_URI="mirror://sourceforge/ming/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+perl +python php static-libs"
 
 RDEPEND="perl? ( dev-lang/perl:= )
 	python? ( dev-lang/python )
 	media-libs/freetype
-	media-libs/libpng
+	media-libs/libpng:0=
 	media-libs/giflib
 	sys-libs/zlib
 	!media-libs/libswf"

diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index e40ec1c..3d6637a 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,6 +1,6 @@
 DIST irssi-0.8.15.tar.bz2 948847 RMD160 0c8fba8cf3409621f6c1883127e14538a58c3359 SHA1 b79ce8c2c98a76b004f63706e7868cd363000d89 SHA256 c12d16fb605103d7c256ddce44012dc396af57f3771e086d0387c195a052a0a6
 EBUILD irssi-0.8.15-r1.ebuild 1455 RMD160 22d86c3b5db20209147224f13f3fc99175929689 SHA1 8f780b5376ab17471a1357d8af861162b247fba3 SHA256 bc5065f287e7755ae4edc5a382e94ba250d68ebe9ac9f689e13eb276b1dcf785
 EBUILD irssi-0.8.15.ebuild 1272 RMD160 2294176b501c701e4ae4e7877963514b5d859507 SHA1 0ec0e8f789002de331724146e67d5ece89faf94d SHA256 979bab61a033281489f325711a3f56d0d1d3b697b9a2a46bbd6a797cba993b5b
-EBUILD irssi-9999.ebuild 1351 RMD160 1be3deee8f654b53105684756bbdbe8fe8d4a668 SHA1 0094bc976379ad54155a050de7e3d5a981258669 SHA256 f2941e8d53ace770bb8139d320a07bd74009bda7ccb452b4a3bf732bb9d36379
+EBUILD irssi-9999.ebuild 1362 RMD160 c484e967aa341d4257f4ca57a8aabc0dda3212f1 SHA1 020f45adac562fd689630e1d5a2b318c9577da20 SHA256 125a97aaea2afa1317b0e1937ad3937e4458b89a204e3aca046353e995fa6ab8
 MISC ChangeLog 23204 RMD160 1242a5a04f411b379c97df197129c6d661106b6d SHA1 2e681ac7de5fed5703ef08e20c8718155314debe SHA256 13a60bddc77ccc637056256a2d98cebfe9357bfe376f3077f7ba414d0b9c6e90
 MISC metadata.xml 270 RMD160 217b6381a937b94caa61f5d1dcbcdf24fe2852f1 SHA1 1e8951324990f813bd348ce2b1c4fc75cb097250 SHA256 4962741e0eded229c8ac0cca6dc8fed203d9b63ed7d8de546c661e6661579c75

diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index e42661f..b9cad75 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-9999.ebuild,v 1.4 2012/05/03 06:27:14 jdhore Exp $
 
-EAPI=4
+EAPI="4-slot-abi"
 GENTOO_DEPEND_ON_PERL=no
 inherit autotools perl-module subversion
 

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 8f2c9d8..d2acf08 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,6 +3,6 @@ DIST cups-filters-1.0.17.tar.gz 1019661 RMD160 de5c5fa4eb1391271d76ca5c049145d60
 DIST cups-filters-1.0.18.tar.gz 1022509 RMD160 84cba51cab4a8c78f80de268342ec281967bdf68 SHA1 00fa6d585a4b546b36d0f4a92855a43982933875 SHA256 6926980653e7cb5f94b91921517678cca7f0e6781364823a05f7b4b0ec919106
 EBUILD cups-filters-1.0.17.ebuild 1119 RMD160 65561b8d4be11439ddccc8fccc3ef4681721999e SHA1 c8a647667d83e53f543b51ad580f807bc8d0c107 SHA256 1cc5f7de3b0b68f7bd0a0c083d235db7fc152bc62b12b874a955e78559566a8a
 EBUILD cups-filters-1.0.18.ebuild 1119 RMD160 7cf53106d123bb434d3e54907ca2f4dbc902bc28 SHA1 1da23549bc08811f42c983081d0177035f10633d SHA256 9f93882bd7da4d4bf55c8254bf1868427b8892cabbbca27cc092ed65e7840ae9
-EBUILD cups-filters-9999.ebuild 1699 RMD160 8685b0b6777e048e8480fe56bf343ec85848db04 SHA1 9ae554d536991827a47ba85448bad478f3a031a3 SHA256 89bfb35500361e6d888247fa731ee80001d18c02f200f0d6c14ada8b3f9669bb
+EBUILD cups-filters-9999.ebuild 1702 RMD160 3a2529dfe92c21df8d8e2ed47ae5de9949fa7bdb SHA1 d9a48a60bf44a80ef9db2a054df4bf0b60504298 SHA256 16aa5c439267c77a430d75b7d3a336b8be38fdc30c991db00f61a361d388ee2d
 MISC ChangeLog 2897 RMD160 8dc39a766ad5ad993463b731621edd70d8ce52c1 SHA1 5a4c83f28c7f030207524606904534d5101a9068 SHA256 c85a368475409082064c3fa324433821b3da807fbfc2090145a8cc389a809757
 MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051

diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 5a3cac4..4d249e7 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	sys-libs/zlib
 	jpeg? ( virtual/jpeg )
 	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff )
 "
 DEPEND="${RDEPEND}"

diff --git a/net-print/cups/Manifest b/net-print/cups/.#Manifest.1.578
similarity index 74%
copy from net-print/cups/Manifest
copy to net-print/cups/.#Manifest.1.578
index ce7a2a3..b8c5d7d 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/.#Manifest.1.578
@@ -1,3 +1,9 @@
+<<<<<<< Manifest
+=======
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+>>>>>>> 1.578
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
 AUX cups-1.4.4-dont-compress-manpages.patch 580 RMD160 cbc2bf11025c1f27286bd7f2ece7ba76be6aa7ee SHA1 d7b2447263724eeb092b8cfc8ce54553ad1e5e11 SHA256 cdefd273dcdc78aa5fe14bb0246e25572da7d28a91de5c7ac8be2a0bdd915860
@@ -28,9 +34,34 @@ DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c
 DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1
 EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a
 EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587
-EBUILD cups-1.5.2-r4.ebuild 8369 RMD160 94548adca32b3ccd7a04caf311c7ca77e3568f6f SHA1 f95bc936a2d3b2cbfb5013ec93d887412f34fdc5 SHA256 0af78b81278ce634e2a047daed79d24927ae2ad734c3531ac8ecbec21a942146
-EBUILD cups-1.5.3.ebuild 8623 RMD160 26d339488b721b19942b28af8e06b6222080fcbb SHA1 87e034b0a0b393f0d3f922d4eae3e81a1eefab7d SHA256 19530ffd65623a37c76a692c4d517c6dab164707f6d560ab9adad038ab9de234
-EBUILD cups-1.6_beta1-r1.ebuild 7855 RMD160 e3661bb285af26a51a2264975d17d10616aa80c0 SHA1 ec466c64a2a10cf0625a486c18229a0315f6dd61 SHA256 350688fdd7007a0e2b223fbc5e981fe370ef2596eeff6805d948a8656e8d7cdb
-EBUILD cups-9999.ebuild 7930 RMD160 d435e9842ebafafda7877b3ef26b12f8504601b0 SHA1 d488a8a57bc7b27e88ef562b7028c6c600df3f29 SHA256 ef88b5053148b4c18ba5c3b67d0aa742f43301fd932a55e8430d4d521eeda5fd
+<<<<<<< Manifest
+EBUILD cups-1.5.2-r4.ebuild 8358 RMD160 063d504cf9dc8fa86c930ee5ba97b933a4d714c6 SHA1 2236e37b7a8eef1d0facb0a3752073a627d38dc6 SHA256 bbb8f9fa84c4ea187e2bcf108df5f59fd7dbbea0ca76df9adf7c9451ab16b886
+EBUILD cups-1.5.3.ebuild 8610 RMD160 9ea42d49bcfee6e8359a79cc860b5fdaa368fa5f SHA1 6ddd54a737710e0f043c88c38eb581548c9c3ad1 SHA256 8ea5b6c3da1b667beb0cf89367f2599b84dc424e76fac6be17d026707284e119
+=======
+EBUILD cups-1.5.2-r4.ebuild 8358 RMD160 019f23a7ec692165365a5ccf2f450dd12952c377 SHA1 ea253303c464cb1a32d50b2717a10518f952dcf9 SHA256 3e37ca1ce032aacdc421f14a7060b1401cb043895483171e7f9653eab02210b7
+EBUILD cups-1.5.3.ebuild 8612 RMD160 b036fd44c4fcfbd8ef37274ec2cee1172c7420e7 SHA1 bc14e078429d29794309a198a739432cb8c539d1 SHA256 781c94470a97fcbcbdf6b0a14167b4cbdaa890c9ce04860adeb5a092d4506099
+>>>>>>> 1.578
+EBUILD cups-1.6_beta1-r1.ebuild 7844 RMD160 c27354ac1adc6d1ec9d27f74fd722262c61c4bb5 SHA1 ac8340228112ffddab0ff1bc04fa1e30024ce263 SHA256 961dbc3935ac11e00bc76655a8727f000658cb6fbfa42b591849a17b355e623c
+EBUILD cups-9999.ebuild 7919 RMD160 f2be286e9079872dae87d8ff34138b1e65fe134b SHA1 2f255964e7dde4deca9dc2acb8cc9c44c5784f0e SHA256 a0d869507700ec75306b5cca625634ee39a6f8065e558a928df83472addadb96
 MISC ChangeLog 75113 RMD160 ca92f89d1f7dc4d24fc9f6cd1a1187a1c2522e77 SHA1 a7f55f5504280ce0bd56f7b74bcddb8f379688a0 SHA256 aa951fed1d5870e6a0466e2f74ba67b8bac9cc2d6de42a820fbf961b8d0d3714
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
+<<<<<<< Manifest
+=======
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIbBAEBCgAGBQJP6hktAAoJENwGBM22xffeOcYP+KXoP5UKm8EzLovVFyot/K2+
+v5KEfntZ8nTue5ti0AF2fsZ2nv2ZDgvi7ApNPZL+PDD/eWpyz96y2eDk4sNc5w9R
+s8OamQxZeE5XfoZhcI9TV/t7Js5l8dhcDsR42TxYlMWvk5pmdXNwJ4f6esFglZ1o
+u7NyjfYsdOusDsaaInx3FLk0pthkhhXR1zplw79J68b1rvOksZJtB4XoEPmZ30J2
+fVFn4waba05XiwcfpqmFsBeOnkveRHIahRSHK9XP82dVswboCX8bA9t1VdLGJbjd
+fnnSmHls7BpOO10jrlDk0B1Q0ezbZbHHMISFiggqjSkdzFlO6fVayQUaudUbxXK0
+VaLGIgZCZrTc/hNX2yiJwtrcp3Bl2CW1B82jAYOYzvDeyTnZ5zKYJGQ7n/Gkkfeo
+UL/V1e7DlF1TW8jqYsH+TyQiqtepCSKSZnkk8R0agPbniqxxt09SaBNvy+QxkxDS
+NNQVB4q/U+QlATNGqJjJfsiW3ngB7YcA2uXKQb/26G8cbi8VENpN+1D6ghQg3bau
+m0DA7/3UpcuQHpNofM1yVVxuE2Z/O8xRZtjvbFhZSKNzxWODlVR/XnBwVSWr72+u
+TlNzSnDukXMxBREu/4XTmw9JJ9xY9JAvPbqUEXtyI1S33dxqDitsqnVktnHA2TU1
+e/f12cAV8I/LCJ9WlDY=
+=sXAZ
+-----END PGP SIGNATURE-----
+>>>>>>> 1.578

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index ce7a2a3..bd916ad 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -25,12 +25,12 @@ DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467ae
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
 DIST cups-1.5.3-avahi.patch.bz2 17298 RMD160 fb2856801c08ddd73eb2677211cc0bba3f74cc57 SHA1 2d15bd82350806a4dfbedc6b3c48da08b3a7efcb SHA256 daed1232c56ff7a3cb293c7eedbb669f3200ac36120a4d2fec09bd91631038ef
 DIST cups-1.5.3-source.tar.bz2 9580485 RMD160 3516c1a0909921c9ae6f33eed9e06c9d9c475e3f SHA1 f7c4fc7d115da20dbbb6a3a568259df6702a7caa SHA256 9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d
-DIST cups-1.6b1-source.tar.bz2 8144645 RMD160 2cd340359661776361cc8d91d3514b0cd0d1f96c SHA1 ef3d67a49cb4c61207f66c9d5f792f04ef65fdf4 SHA256 ab2bd150635bfd84b710c92a942cdbff98fd74702d4aba04dd720064ccaa1fa1
+DIST cups-1.6rc1-source.tar.bz2 8139002 RMD160 92d99c2e53c2c51d37d011f4edf28da1757975b5 SHA1 25dbfde70629cf4316167531ec4825da531c3dc2 SHA256 bb615f64172baf4b97218d1ae6ef0858b4dda8905e1135226d63550c285cec69
 EBUILD cups-1.4.8-r1.ebuild 7244 RMD160 a1c15926b837ec497fe496a7f0f9051a0de8d923 SHA1 4068757755bb1b9d7e5a7057e041238232d458c7 SHA256 36ab04f13134fdc205b2ca137473e9489fd4dfd1cd0046362d94fbeecffa920a
 EBUILD cups-1.4.8-r23.ebuild 8854 RMD160 b84a4dbe91f91f012f457d2436e44a69c1f78727 SHA1 7bf8931ed2731b5600aeb70f78dd06dbdace0dbc SHA256 901288e3a86de7a3f2d797c63e20086da01c01141f63ac4b531281c3273ee587
 EBUILD cups-1.5.2-r4.ebuild 8369 RMD160 94548adca32b3ccd7a04caf311c7ca77e3568f6f SHA1 f95bc936a2d3b2cbfb5013ec93d887412f34fdc5 SHA256 0af78b81278ce634e2a047daed79d24927ae2ad734c3531ac8ecbec21a942146
 EBUILD cups-1.5.3.ebuild 8623 RMD160 26d339488b721b19942b28af8e06b6222080fcbb SHA1 87e034b0a0b393f0d3f922d4eae3e81a1eefab7d SHA256 19530ffd65623a37c76a692c4d517c6dab164707f6d560ab9adad038ab9de234
-EBUILD cups-1.6_beta1-r1.ebuild 7855 RMD160 e3661bb285af26a51a2264975d17d10616aa80c0 SHA1 ec466c64a2a10cf0625a486c18229a0315f6dd61 SHA256 350688fdd7007a0e2b223fbc5e981fe370ef2596eeff6805d948a8656e8d7cdb
-EBUILD cups-9999.ebuild 7930 RMD160 d435e9842ebafafda7877b3ef26b12f8504601b0 SHA1 d488a8a57bc7b27e88ef562b7028c6c600df3f29 SHA256 ef88b5053148b4c18ba5c3b67d0aa742f43301fd932a55e8430d4d521eeda5fd
-MISC ChangeLog 75113 RMD160 ca92f89d1f7dc4d24fc9f6cd1a1187a1c2522e77 SHA1 a7f55f5504280ce0bd56f7b74bcddb8f379688a0 SHA256 aa951fed1d5870e6a0466e2f74ba67b8bac9cc2d6de42a820fbf961b8d0d3714
+EBUILD cups-1.6_rc1.ebuild 7769 RMD160 6872c7920788c8245fd297af33f97f7f421146f3 SHA1 c75fceb40f4c4be0f31a35b701ece91e8abc61c7 SHA256 7bec7ae013524a769070456450fbf8b041aea723cc7fa49cc2a2bb7956d823e0
+EBUILD cups-9999.ebuild 7870 RMD160 6f7fba4ed728495ad4e33ed845fe28d039129130 SHA1 136bcff38fdbd3914f0e36752819dac617b0ef46 SHA256 091f15d8f9041518db3cb603b1275bc590298133b630031fb7fc8531a457ac00
+MISC ChangeLog 75389 RMD160 6f7124efeace30611106ded4f51823fb036022e1 SHA1 1db3f60db95d5fac42b57963a75570c3f26c3dd8 SHA256 f7d833ee48ca0218a0c81fb5ac1b552fd4312c484e7a45543ef3a3c17ab91a2a
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8

diff --git a/net-print/cups/cups-1.6_beta1-r1.ebuild b/net-print/cups/cups-1.6_rc1.ebuild
similarity index 96%
rename from net-print/cups/cups-1.6_beta1-r1.ebuild
rename to net-print/cups/cups-1.6_rc1.ebuild
index f92c68e..eb48d04 100644
--- a/net-print/cups/cups-1.6_beta1-r1.ebuild
+++ b/net-print/cups/cups-1.6_rc1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6_beta1-r1.ebuild,v 1.1 2012/06/09 10:59:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6_rc1.ebuild,v 1.2 2012/06/30 22:26:03 dilfridge Exp $
 
-EAPI="4-slot-abi"
+EAPI=4
 
 PYTHON_DEPEND="python? 2:2.5"
 
 inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
 
-MY_P=${P/_beta/b}
-MY_PV=${PV/_beta/b}
+MY_P=${P/_/}
+MY_PV=${PV/_/}
 
 if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
@@ -28,7 +28,7 @@ SLOT="0"
 IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
 	python +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+LANGS="ja"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done

diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index fcd1082..fc509b3 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.12 2012/06/09 10:59:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.13 2012/06/30 22:26:03 dilfridge Exp $
 
 EAPI="4-slot-abi"
 
@@ -28,7 +28,7 @@ SLOT="0"
 IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
 	python +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
+LANGS="ja"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index c49f472..60fd933 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -14,6 +14,6 @@ DIST gdal-1.8.1.tar.gz 8852355 RMD160 4ac1cd59979464bd37b4d2aa588092ee0c34d45c S
 DIST gdal-1.9.1.tar.gz 9487505 RMD160 c4d77975b753fae75c634662e5e572fc2308456e SHA1 c1eae556398ff7b9332afe9d3022dcd931130808 SHA256 5b829e91c5d6c6c9af23fe6322e51bae9339e8805d52724cb0ad0b741aef7fa9
 EBUILD gdal-1.6.3-r1.ebuild 6787 RMD160 6a587d3f3f6580f037d4e24535e4482d051e8dd5 SHA1 5eca4f493b479c02e5a9f14ec03c2cf4eacaa54b SHA256 fa637b105c2d1289bf2f671128c9b57c8038463f79f6b018ad6933a63d5b2093
 EBUILD gdal-1.8.1-r1.ebuild 6841 RMD160 23773bca147cab5f63d7161b977de5e801cf4010 SHA1 8fa5e76b30f3fbdd0aba888ef9a32089e20b502a SHA256 80a9cb48c1de30a447ed7d4512f368b30eeb5e9ad64250b9863369f309d7bbba
-EBUILD gdal-1.9.1.ebuild 7882 RMD160 0104c5a924e201625a0317c6af953374998e9f57 SHA1 de14039d47de60db2103086e9e6a1279bf44bb6e SHA256 5d7a545902e37470ce63e6c46b6cb753fead0505fa8fc02d2a054ce032c5ff15
+EBUILD gdal-1.9.1.ebuild 7885 RMD160 2e6bbefe469958a70ce92c41fba9d589008e80df SHA1 bd6f7fcaf36efa617ec0a6b8f6f224d6a0357a92 SHA256 347846ac5fa6ded3801ab4c2b2576c350d4e495299ffc805d2d9d5a008b04031
 MISC ChangeLog 23865 RMD160 5ad0de41abb560615d313b06e9ae05288f3ad577 SHA1 24f034784031891a0ffbff7d9449b4d72d4df43c SHA256 e47fc7476855022df46abda31f46be17372feab80dff99524e813c10b88cc710
 MISC metadata.xml 1572 RMD160 1088e92594a056905dc479a997415fc6f4e58a88 SHA1 cf9c406464eee430444ad20eb09e33f284177bf4 SHA256 a8fe59507f9e4082756f8fee9ecc40b1fd6d23fa7a589e5a056b71af76724814

diff --git a/sci-libs/gdal/gdal-1.9.1.ebuild b/sci-libs/gdal/gdal-1.9.1.ebuild
index 98f4ef0..a28d08e 100644
--- a/sci-libs/gdal/gdal-1.9.1.ebuild
+++ b/sci-libs/gdal/gdal-1.9.1.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 		app-text/poppler
 	)
 	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0= )
 	postgres? ( >=dev-db/postgresql-base-8.4 )
 	python? ( dev-python/numpy )
 	ruby? ( dev-lang/ruby:1.9 )

diff --git a/sys-auth/polkit/.#Manifest.1.91 b/sys-auth/polkit/.#Manifest.1.91
deleted file mode 100644
index e2eec33..0000000
--- a/sys-auth/polkit/.#Manifest.1.91
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST polkit-0.104.tar.gz 1416583 RMD160 244e825347a463ff4b9eb0a2318ab04c821bded9 SHA1 599208cf584b9e13f8c9d863238a8271af4aba62 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9
-DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a SHA1 53d56484a5bffb0aaf645c8d813b3063e01e8423 SHA256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df
-DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
-EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
-EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
-EBUILD polkit-0.106-r2.ebuild 3053 RMD160 c72671afc8f157b80374a0c34a5587b157f002e9 SHA1 0b8c5a8bd8d9a6b32d3c300be045eca08804e4eb SHA256 9c7be04b6b0528204f857219983322f3aa38e400dae46574fa512badd9589eed
-MISC ChangeLog 11429 RMD160 76e2a57cbab4a45cd81755793401fee45aa80fcc SHA1 7349a702b23cee2eea9677a9decf8cd2a8d660d8 SHA256 5526adf7f5b12cd0ab4aa6586c992e026f4603dc61dd597faefad35c37dab259
-MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba

diff --git a/sys-auth/polkit/.#Manifest.1.93 b/sys-auth/polkit/.#Manifest.1.93
deleted file mode 100644
index 40a638a..0000000
--- a/sys-auth/polkit/.#Manifest.1.93
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST polkit-0.104.tar.gz 1416583 RMD160 244e825347a463ff4b9eb0a2318ab04c821bded9 SHA1 599208cf584b9e13f8c9d863238a8271af4aba62 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9
-DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a SHA1 53d56484a5bffb0aaf645c8d813b3063e01e8423 SHA256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df
-DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
-EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
-EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
-EBUILD polkit-0.106-r2.ebuild 2944 RMD160 692481f847aff6601a3468e938bff3334698ef8c SHA1 4fe3ae9cea9a1494d9575ede92197ee1b4301682 SHA256 f17b750e069cff665a55072c6a3ef964ddb7a37864f1d9f49e1bfc3b67aae0bb
-EBUILD polkit-0.106-r3.ebuild 3066 RMD160 18ef1dfed87b146c977ac3e8d40545ed83e9a2e3 SHA1 4641692d6a936966ba2beead438f2371f2e1b2be SHA256 97887b7820e97d15827df50b47348aa1d12aeeae8b0f7f0c74561a0f02973f9c
-MISC ChangeLog 11790 RMD160 aba3b3f69b9238d3038b05ad8bcc9bc4d9a62b23 SHA1 811278ba40af831262c80864f2b4b23f22d3876f SHA256 7e4a016b9aacc2cf594287b4cdf0dee073490e0cf2ee656de63097540d5fb3ce
-MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba

diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 11cf7c8..62d4b1d 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,8 +1,9 @@
 DIST polkit-0.104.tar.gz 1416583 RMD160 244e825347a463ff4b9eb0a2318ab04c821bded9 SHA1 599208cf584b9e13f8c9d863238a8271af4aba62 SHA256 6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9
 DIST polkit-0.105.tar.gz 1431080 RMD160 cd1100ee69a308d620e437d34e471580bb6dcf5a SHA1 53d56484a5bffb0aaf645c8d813b3063e01e8423 SHA256 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df
 DIST polkit-0.106.tar.gz 1381428 RMD160 6fa79aaa4e67e072d16860f1a242b053cc311bc3 SHA1 665624f5d69876ec5833f7952290188ca594aac0 SHA256 4005076a67aaa182872c1e316939fcb0ba74a89298e6330d72cfdac6624c984e
-EBUILD polkit-0.104-r1.ebuild 3548 RMD160 e056d1186192d865a610ebe1250e8adf9250eed7 SHA1 1a7cec206005fdb8985fc308f16bbe6f76b45c34 SHA256 a038cdfd2381bd5ddbd6cf4feef8a3aaa126b4e80a6205979538c9ebcbf0b9a0
-EBUILD polkit-0.105.ebuild 2194 RMD160 7f46dccee0326480a5c1c2fd276df48553abd630 SHA1 f41f0393be142066d39d52994f7f29f52c336f2c SHA256 15339d2d61f350eec88ad0fd90cec401df45106fc2ee52ee7b8b051103a5279e
-EBUILD polkit-0.106-r5.ebuild 3017 RMD160 aca1a2a7f62a8f2beb4a7d1edce686f5d90f4775 SHA1 63c1fe580c91ade8cff55fd704d33d82506e8df4 SHA256 b41c3e0ab952787e0a261984c75ac1f794e6280776d18ca7179f3b171c5558c2
-MISC ChangeLog 12970 RMD160 14e39e225b9973a37c6bd58f3d9b4f64b6814628 SHA1 5995158febaff4b447bd798ce980596c3a5521fc SHA256 99cc239c819a8ef2cd7ebb37a84275bab14b50012cd19017f692e427b2386741
+EBUILD polkit-0.104-r1.ebuild 3599 RMD160 0971476dcae7e67dbdd40588d47ebbbc61873b65 SHA1 e179cfc1e5a4a383ae98bc4913c03e32a267e41b SHA256 a4c259b6a560da465278a4a1aba930e8abf1eade4a82adc239e078d8975f6709
+EBUILD polkit-0.105.ebuild 2241 RMD160 e7a155386c6b9fb189799d423cb0843ca8fc6ba7 SHA1 dc20155d6178c0a017ff8c1374428102b22c9468 SHA256 4ec832b243b7623a289ba38cee2576e6cda162d9fb3ad1afb995ae797968cfb8
+EBUILD polkit-0.106-r5.ebuild 3064 RMD160 5b6e155a11696971833fcc4489085ec7203acee7 SHA1 66b4f3839076ae28c366631e70cab8968f123eb5 SHA256 8780b8e36dfb84d78d33bf92087593336f3be9e29c80661bef1224a636da0bfa
+EBUILD polkit-0.106-r6.ebuild 3239 RMD160 9b102b555d97b0d58d19abaa9255407b30a01041 SHA1 b6524bba4d27bcce2a23ea7f74bdf399caecf70b SHA256 b6d3e2365abb19208bcc76328bf96dd49673ffdd50c84eefbf54fdd05973167c
+MISC ChangeLog 13370 RMD160 bf0a601a62e2a8ee14d0047a6f2b4d874784e570 SHA1 65f23be7c9c1b2ca430ab7e75fa3ad1061ba5a40 SHA256 44732e39e931962426ae6ff45461bf921c1885d6946c0caf9923b9f15940d95b
 MISC metadata.xml 516 RMD160 0c65650680494cadd548ec430b11facf2cc28912 SHA1 092816617aa2ab7a9047298b6752b82bbab33520 SHA256 be8c8239fecd14fd1a9c1dee11ccb98b1188aceacf6ea58233a0f958ab648aba

diff --git a/sys-auth/polkit/polkit-0.104-r1.ebuild b/sys-auth/polkit/polkit-0.104-r1.ebuild
index bdccc3d..3681411 100644
--- a/sys-auth/polkit/polkit-0.104-r1.ebuild
+++ b/sys-auth/polkit/polkit-0.104-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.104-r1.ebuild,v 1.9 2012/05/04 18:57:21 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.104-r1.ebuild,v 1.10 2012/06/30 10:27:11 swift Exp $
 
 EAPI=4
 inherit pam
@@ -12,12 +12,13 @@ SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc examples gtk +introspection kde nls pam systemd"
+IUSE="debug doc examples gtk +introspection kde nls pam selinux systemd"
 
 RDEPEND=">=dev-libs/glib-2.30
 	dev-libs/expat
 	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
 	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-policykit )
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2

diff --git a/sys-auth/polkit/polkit-0.105.ebuild b/sys-auth/polkit/polkit-0.105.ebuild
index 63b4532..b10703c 100644
--- a/sys-auth/polkit/polkit-0.105.ebuild
+++ b/sys-auth/polkit/polkit-0.105.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.105.ebuild,v 1.2 2012/05/20 13:15:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.105.ebuild,v 1.3 2012/06/30 10:27:11 swift Exp $
 
 EAPI=4
 inherit pam
@@ -12,12 +12,13 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc examples gtk +introspection kde nls pam systemd"
+IUSE="debug doc examples gtk +introspection kde nls pam selinux systemd"
 
 RDEPEND=">=dev-libs/glib-2.30
 	>=dev-libs/expat-2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.2 )
 	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-policykit )
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2

diff --git a/sys-auth/polkit/polkit-0.106-r5.ebuild b/sys-auth/polkit/polkit-0.106-r5.ebuild
index d61e480..c983e0c 100644
--- a/sys-auth/polkit/polkit-0.106-r5.ebuild
+++ b/sys-auth/polkit/polkit-0.106-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r5.ebuild,v 1.3 2012/06/27 11:56:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r5.ebuild,v 1.4 2012/06/30 10:27:11 swift Exp $
 
 EAPI="4-slot-abi"
 inherit eutils multilib pam pax-utils systemd user
@@ -12,7 +12,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug examples gtk +introspection kde nls pam systemd"
+IUSE="debug examples gtk +introspection kde nls pam selinux systemd"
 
 RDEPEND=">=dev-lang/spidermonkey-1.8.5:=
 	>=dev-libs/glib-2.32
@@ -22,6 +22,7 @@ RDEPEND=">=dev-lang/spidermonkey-1.8.5:=
 		sys-auth/pambase
 		virtual/pam
 		)
+	selinux? ( sec-policy/selinux-policykit )
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2

diff --git a/sys-auth/polkit/.#polkit-0.106-r2.ebuild.1.3 b/sys-auth/polkit/polkit-0.106-r6.ebuild
similarity index 57%
rename from sys-auth/polkit/.#polkit-0.106-r2.ebuild.1.3
rename to sys-auth/polkit/polkit-0.106-r6.ebuild
index 3bac9f4..9d2fc34 100644
--- a/sys-auth/polkit/.#polkit-0.106-r2.ebuild.1.3
+++ b/sys-auth/polkit/polkit-0.106-r6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r2.ebuild,v 1.3 2012/06/19 12:04:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.106-r6.ebuild,v 1.1 2012/07/01 13:30:22 ssuominen Exp $
 
 EAPI=4
-inherit eutils pam systemd user
+inherit eutils multilib pam pax-utils systemd user
 
 DESCRIPTION="Policy framework for controlling privileges for system-wide services"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit"
@@ -12,9 +12,9 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug examples gtk +introspection kde nls pam systemd"
+IUSE="debug examples gtk +introspection kde nls pam selinux systemd"
 
-RDEPEND=">=dev-lang/spidermonkey-1.8.5
+RDEPEND=">=dev-lang/spidermonkey-1.8.5:=
 	>=dev-libs/glib-2.32
 	>=dev-libs/expat-2
 	introspection? ( >=dev-libs/gobject-introspection-1 )
@@ -22,6 +22,7 @@ RDEPEND=">=dev-lang/spidermonkey-1.8.5
 		sys-auth/pambase
 		virtual/pam
 		)
+	selinux? ( sec-policy/selinux-policykit )
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
@@ -41,25 +42,26 @@ PDEPEND="
 		)
 	!systemd? ( >=sys-auth/consolekit-0.4.5_p2012[policykit] )"
 
-DOCS="docs/TODO HACKING NEWS README"
-
 pkg_setup() {
-	enewgroup polkitd
-	enewuser polkitd -1 -1 /var/lib/polkit-1 polkitd
-	esethome polkitd /var/lib/polkit-1
+	local u=polkitd
+	local g=polkitd
+	local h=/var/lib/polkit-1
+
+	enewgroup ${g}
+	enewuser ${u} -1 -1 ${h} ${g}
+	esethome ${u} ${h}
 }
 
 src_prepare() {
-	sed -i -e '/unix-group/s:wheel:adm:' src/polkitbackend/*-default.rules || die #401513
-
-	has_version ">=dev-lang/spidermonkey-1.8.7" && { sed -i -e '/mozjs/s:185:187:g' configure || die; }
+	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
+	has_version "dev-lang/spidermonkey:0/187" && { sed -i -e '/mozjs/s:185:187:g' configure || die; }
+	# http://bugs.freedesktop.org/show_bug.cgi?id=51617
+	sed -i \
+		-e "/polkit-agent-helper-1/s:/lib/polkit-1:/$(get_libdir)/polkit-1:" \
+		src/polkitagent/polkitagentsession.c || die
 }
 
 src_configure() {
-	local myconf="--with-authfw=shadow"
-	use pam && \
-		myconf="--with-authfw=pam --with-pam-module-dir=$(getpam_mod_dir) --with-pam-include=system-local-login"
-
 	econf \
 		--localstatedir="${EPREFIX}"/var \
 		--disable-static \
@@ -70,17 +72,21 @@ src_configure() {
 		$(use_enable introspection) \
 		--disable-examples \
 		$(use_enable nls) \
-		--with-os-type=gentoo \
 		"$(systemd_with_unitdir)" \
-		${myconf}
+		--with-authfw=$(usex pam pam shadow) \
+		$(use pam && echo --with-pam-module-dir="$(getpam_mod_dir)") \
+		--with-os-type=gentoo
 }
 
 src_install() {
-	default
+	emake \
+		DESTDIR="${D}" \
+		libprivdir="${EPREFIX}"/usr/$(get_libdir)/polkit-1 \
+		install
 
-	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
+	dodoc docs/TODO HACKING NEWS README
 
-	prune_libtool_files
+	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
 
 	diropts -m0700 -o polkitd -g polkitd
 	keepdir /var/lib/polkit-1
@@ -89,20 +95,19 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins src/examples/{*.c,*.policy*}
 	fi
+
+	prune_libtool_files
+	rm -f "${ED}"/usr/lib*/pkgconfig/polkit-backend-1.pc #423431
+
+	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
+	if has_version '<dev-lang/spidermonkey-1.8.7'; then
+		pax-mark mr "${ED}"/usr/$(get_libdir)/polkit-1/polkitd
+	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
+		pax-mark m "${ED}"/usr/$(get_libdir)/polkit-1/polkitd
+	fi
 }
 
 pkg_postinst() {
 	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
 	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-
-	echo
-	ewarn "If home directory of unix-user \"polkitd\" is set to /dev/null, run:"
-	ewarn "# usermod -d /var/lib/polkit-1 polkitd"
-
-	echo
-	ewarn "The default administrator unix-group was changed from \"wheel\" to"
-	ewarn "\"adm\", see *-default.rules in /etc/polkit-1/rules.d"
-	ewarn "Users of unix-group \"adm\" can run, for example, \"pkexec /bin/sh\""
-	ewarn "to gain root shell without root password."
-	ewarn "For more information, see http://bugs.gentoo.org/401513"
 }

diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
new file mode 100644
index 0000000..483ad55
--- /dev/null
+++ b/x11-drivers/ati-drivers/Manifest
@@ -0,0 +1,14 @@
+AUX amd-drivers-3.2.7.1.patch 560 RMD160 d3703be2c979c784af325072c7eb9d04f52754c5 SHA1 d1d45998ac2588670ead6e6a1ce6dd29fef0c808 SHA256 7cc315754a47fbda6bf36bcee01780da7c19535c4f6ec1cccc556e9a7b32d263
+AUX ati-drivers-12.2-redefine-WARN.patch 1316 RMD160 13d135adc00eee61665590a34a3c8f0dcd607b1b SHA1 65f979af2e1807cfbd98c7407940693a8f4f72b0 SHA256 f7d8ad3307823925cf8b4c6540db17a51553e48dd008793fc026803bb2aa1ced
+AUX ati-drivers-old_rsp.patch 989 RMD160 2add85536ee5e302f283400e4a4b18b74b6a8001 SHA1 511b746f2348249dc1c84013f9c336ae9f279664 SHA256 dd222de89b515046c6cbfef172a3ec8d4bc48664799b3bbfff648091c6d54b49
+AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
+AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
+AUX switchlibGL 1349 RMD160 d3c9f36fabf65b21f26456e303d8127779fd1bd2 SHA1 277a549afd62fdeae9f09022a8e55ceabf180f9f SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0
+DIST amd-driver-installer-12-2-x86.x86_64.run 107213014 RMD160 b3966f0ad6c756f6d4fd77cde5761a86ef2ef3b2 SHA1 24bbaa07dbc8354a0393c4ceeed552d7ac37b09d SHA256 054796cbf2d99e4b545d062ce8eabfd973e74e2e21a159092816238b001618fd
+DIST amd-driver-installer-12-4-x86.x86_64.run 108360519 RMD160 78eae42f40f211bba8e62b9896146f5a4c1bdc0d SHA1 7db947ee20929ba24da03bad2624538cb55589b6 SHA256 7f3ba3d96eba30fc09aec03ba72f5482d3b192bb0ea63a5e7b79454b053cb63c
+DIST amd-driver-installer-12-6-x86.x86_64.run 106660241 RMD160 7e51dc6949e6f7231eac89779bd56608b075522b SHA1 a43e14c7e8ce323a93c69d93351c7a82ad0c2a52 SHA256 b5c6070dc75e9296d0f04e7e0b3c6697f6c21872d50b1dcf4d7b3b0ab7ce7155
+EBUILD ati-drivers-12.2.ebuild 19143 RMD160 dbb5af2e8ba57dad8e23bdddebe2cba275d4af9b SHA1 12f89a32ab014b41408793cda7a05d6ee512173a SHA256 6120f6b5a084fd562735ec756b7759c2cb70bf4cd0dfed7af4c9888bf61c31bb
+EBUILD ati-drivers-12.4.ebuild 19753 RMD160 e663b774424f5e9e5ea7362a612cf5da876f1db0 SHA1 b5d310c8514c8e85e9c4a45a612502b1eeefbfb1 SHA256 27704f2c62fc51236cad37a7b8443c545c023b4054eac62fce782c70fb75e7df
+EBUILD ati-drivers-12.6.ebuild 20130 RMD160 1d724d985986d2fc0dbe7aebeff59ea7ff8ca4ce SHA1 3ac13afa620aac84296948fa766e6b99b4003bcf SHA256 8c6490b4af9535f68576a094c27f0d07df18553e7102ee3f9a86408f871c6c1a
+MISC ChangeLog 77931 RMD160 07d69b9cb93872d9f4e0dc78e1a99d2478ac8f90 SHA1 4702016343495758e52d55285f05a97244c19ccb SHA256 7293769179111f5c86520a6b87942c2b8c6262471752a3f4553016d80c89e0c4
+MISC metadata.xml 705 RMD160 0b1c9eb7cb21ebb1713d391a09d94c918b4f8b1e SHA1 e7e3722d3afaa9c4a18191f8f50b943fb7a0021a SHA256 5bc8c6b51d5848d2946592546a67243270c9267a6eda2e6167ee8d1971c09614

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
new file mode 100644
index 0000000..cd07b45
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
@@ -0,0 +1,600 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild,v 1.3 2012/04/14 15:25:11 maekke Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
+
+DESCRIPTION="Ati precompiled drivers for radeon r600 (HD Series) and newer chipsets"
+HOMEPAGE="http://www.amd.com"
+# 8.ble will be used for beta releases.
+if [[ $(get_major_version) -gt 8 ]]; then
+	ATI_URL="http://www2.ati.com/drivers/linux/"
+	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
+	FOLDER_PREFIX="common/"
+else
+	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
+	FOLDER_PREFIX=""
+fi
+IUSE="debug +modules multilib pax_kernel qt4"
+
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
+KEYWORDS="amd64 x86"
+SLOT="1"
+
+RDEPEND="
+	<=x11-base/xorg-server-1.11.49:=[-minimal]
+	>=app-admin/eselect-opengl-1.0.7
+	app-admin/eselect-opencl
+	sys-power/acpid
+	x11-apps/xauth
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	multilib? (
+			app-emulation/emul-linux-x86-opengl
+			app-emulation/emul-linux-x86-xlibs
+	)
+	qt4? (
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXfixes
+			x11-libs/libXxf86vm
+			x11-libs/qt-core
+			x11-libs/qt-gui
+	)
+"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+	x11-libs/libXtst
+	sys-apps/findutils
+	app-misc/pax-utils
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+# QA Silencing
+QA_TEXTRELS="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/libatiadlxx.so
+	usr/lib*/xorg/modules/glesx.so
+	usr/lib*/libaticaldd.so
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_EXECSTACK="
+	opt/bin/atiode
+	opt/bin/amdcccle
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_WX_LOAD="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+"
+
+QA_SONAME="
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
+"
+
+QA_DT_HASH="
+	opt/bin/amdcccle
+	opt/bin/aticonfig
+	opt/bin/atiodcli
+	opt/bin/atiode
+	opt/bin/clinfo
+	opt/bin/fglrxinfo
+	opt/sbin/atieventsd
+	opt/sbin/amdnotifyui
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libatiuki.so.1.0
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
+	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+"
+
+_check_kernel_config() {
+	local failed=0
+	local error=""
+	if ! kernel_is ge 2 6; then
+		eerror "You need a 2.6 linux kernel to compile against!"
+		die "No 2.6 Kernel found"
+	fi
+
+	if ! linux_chkconfig_present MTRR; then
+		ewarn "You don't have MTRR support enabled in the kernel."
+		ewarn "Direct rendering will not work."
+	fi
+
+	if linux_chkconfig_builtin DRM; then
+		ewarn "You have DRM support built in to the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present AGP && \
+		! linux_chkconfig_present PCIEPORTBUS; then
+		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present ACPI; then
+		eerror "${P} requires the ACPI support in the kernel"
+		eerror "Please enable it:"
+		eerror "    CONFIG_ACPI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Power management and ACPI options --->"
+		eerror "        [*] Power Management support"
+		eerror "in the 'menuconfig'"
+		error+=" CONFIG_ACPI disabled;"
+		failed=1
+	fi
+
+	if ! linux_chkconfig_present PCI_MSI; then
+		eerror "${P} requires MSI in the kernel."
+		eerror "Please enable it:"
+		eerror "    CONFIG_PCI_MSI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Bus options (PCI etc.)  --->"
+		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
+		eerror "in the kernel config."
+		error+=" CONFIG_PCI_MSI disabled;"
+		failed=1
+	fi
+
+	if linux_chkconfig_present LOCKDEP; then
+		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
+		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
+		eerror "This prevents ${P} from compiling with an error like this:"
+		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+		eerror "Please make sure the following options have been unset:"
+		eerror "    Kernel hacking  --->"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
+		eerror "in 'menuconfig'"
+		error+=" LOCKDEP enabled;"
+		failed=1
+	fi
+
+	use amd64 && if ! linux_chkconfig_present COMPAT; then
+		eerror "${P} requires COMPAT."
+		eerror "Please enable the 32 bit emulation:"
+		eerror "Executable file formats / Emulations  --->"
+		eerror "    [*] IA32 Emulation"
+		eerror "in the kernel config."
+		eerror "if this doesn't enable CONFIG_COMPAT add"
+		eerror "    CONFIG_COMPAT=y"
+		eerror "in /usr/src/linux/.config"
+		error+=" COMPAT disabled;"
+		failed=1
+	fi
+
+	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
+		eerror "${P} requires BKL."
+		eerror "Please enable the Big Kernel Lock:"
+		eerror "Kernel hacking  --->"
+		eerror "    [*] Big Kernel Lock"
+		eerror "in the kernel config."
+		eerror "or add"
+		eerror "    CONFIG_BKL=y"
+		eerror "in /usr/src/linux/.config"
+		error+=" BKL disabled;"
+		failed=1
+	fi
+
+	[[ ${failed} -ne 0 ]] && die "${error}"
+}
+
+pkg_pretend() {
+	# workaround until bug 365543 is solved
+	if use modules; then
+		linux-info_pkg_setup
+		require_configured_kernel
+		_check_kernel_config
+	fi
+}
+
+pkg_setup() {
+	if use modules; then
+		MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
+		BUILD_TARGETS="kmod_build"
+		linux-mod_pkg_setup
+		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
+		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+		if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+		else
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+		fi
+	fi
+	# Define module dir.
+	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+	# get the xorg-server version and set BASE_DIR for that
+	BASE_DIR="${S}/xpic"
+
+	# amd64/x86
+	if use amd64 ; then
+		MY_BASE_DIR="${BASE_DIR}_64a"
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		MY_BASE_DIR="${BASE_DIR}"
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+
+	elog
+	elog "Please note that this driver supports only graphic cards based on"
+	elog "r600 chipset and newer."
+	elog "This represent the AMD Radeon HD series at this moment."
+	elog
+	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
+	elog "For migration informations please reffer to:"
+	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+	einfo
+}
+
+src_unpack() {
+	if [[ $(get_major_version) -gt 8 ]]; then
+		# Switching to a standard way to extract the files since otherwise no signature file
+		# would be created
+		local src="${DISTDIR}/${A}"
+		sh "${src}" --extract "${S}"  2&>1 /dev/null
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# All kernel options for prepare are ment to be in here
+	if use modules; then
+		# version patches
+		# epatch "${FILESDIR}"/kernel/${PV}-*.patch
+		if use debug; then
+			sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+				"${MODULE_DIR}/firegl_public.c" \
+				|| die "Failed to enable debug output."
+		fi
+	fi
+
+	# These are the userspace utilities that we also have source for.
+	# We rebuild these later.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
+		|| die "bin rm failed"
+
+	# in this version amdcccle isn't static, thus we depend on qt4
+	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
+
+	# ACPI fixups
+	sed -i \
+		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+		-e "s:/var/lib/gdm/:/var/gdm/:" \
+		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
+		|| die "sed failed."
+
+	# Since "who" is in coreutils, we're using that one instead of "finger".
+	sed -i -e 's:finger:who:' \
+		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+		|| die "Replacing 'finger' with 'who' failed."
+	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+	# add function to detect default state.
+	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
+
+	# fix needed for at least hardened-sources, see bug #392753
+	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
+
+	cd "${MODULE_DIR}"
+
+	# bugged fglrx build system, this file should be copied by hand
+	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+	cd "${S}"
+
+	mkdir extra || die "mkdir failed"
+	cd extra
+	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
+}
+
+src_compile() {
+	use modules && linux-mod_src_compile
+
+	ebegin "Building fgl_glxgears"
+	cd "${S}"/extra/fgl_glxgears
+	# These extra libs/utils either have an Imakefile that does not
+	# work very well without tweaking or a Makefile ignoring CFLAGS
+	# and the like. We bypass those.
+	# The -DUSE_GLU is needed to compile using nvidia headers
+	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
+	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+		-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
+		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+	eend $?
+}
+
+src_test() { :; } # no tests present
+
+src_install() {
+	use modules && linux-mod_src_install
+
+	# We can do two things here, and neither of them is very nice.
+
+	# For direct rendering libGL has to be able to load one or more
+	# dri modules (files ending in _dri.so, like fglrx_dri.so).
+	# Gentoo's mesa looks for these files in the location specified by
+	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
+	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+	# 64bit. So we can either put the .so files in that (unusual,
+	# compared to "normal" mesa libGL) location or set
+	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+	# 101539.
+
+	# The problem with this approach is that LIBGL_DRIVERS_PATH
+	# *overrides* the default hardcoded location, it does not extend
+	# it. So if ati-drivers is merged but a non-ati libGL is selected
+	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+	# (because it changed in a newer mesa or because it was compiled
+	# for a different set of multilib abis than we are) stuff breaks.
+
+	# We create one file per ABI to work with "native" multilib, see
+	# below.
+
+	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+	doenvd "${T}/03ati-colon-sep" || die
+
+	# All libraries that we have a 32 bit and 64 bit version of on
+	# amd64 are installed in src_install-libs. Everything else
+	# (including libraries only available in native 64bit on amd64)
+	# goes in here.
+
+	# There used to be some code here that tried to detect running
+	# under a "native multilib" portage ((precursor of)
+	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
+	# should just work (only doing some duplicate work). --marienz
+	if has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	# This is sorted by the order the files occur in the source tree.
+
+	# X modules.
+	exeinto /usr/$(get_libdir)/xorg/modules/drivers
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
+
+	# Arch-specific files.
+	# (s)bin.
+	into /opt
+	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+	use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
+	dobin "${ARCH_DIR}"/usr/bin/clinfo
+	# We cleaned out the compilable stuff in src_unpack
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
+
+	# Common files.
+	# etc.
+	insinto /etc/ati
+	exeinto /etc/ati
+	# Everything except for the authatieventsd.sh script.
+	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
+	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
+
+	# include.
+	insinto /usr
+	doins -r ${FOLDER_PREFIX}usr/include
+	insinto /usr/include/X11/extensions
+
+	# Just the atigetsysteminfo.sh script.
+	into /usr
+	dosbin ${FOLDER_PREFIX}usr/sbin/*
+
+	# data files for the control panel.
+	if use qt4 ; then
+		insinto /usr/share
+		doins -r ${FOLDER_PREFIX}usr/share/ati
+		insinto /usr/share/pixmaps
+		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
+		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
+			ccc_large System
+	fi
+
+	# doc.
+	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
+
+	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
+
+	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+	exeinto /etc/acpi
+	doexe ati-powermode.sh
+	insinto /etc/acpi/events
+	doins events/*
+
+	popd > /dev/null
+
+	# Done with the "source" tree. Install tools we rebuilt:
+	dobin extra/fgl_glxgears/fgl_glxgears
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears
+
+	# Gentoo-specific stuff:
+	newinitd "${FILESDIR}"/atieventsd.init atieventsd
+	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+	newconfd "${T}"/atieventsd.conf atieventsd
+
+	# PowerXpress stuff
+	exeinto /usr/$(get_libdir)/fglrx
+	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
+	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
+	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local EX_BASE_DIR="${BASE_DIR}_64a"
+		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
+		local oclsuffix=64
+	else
+		local EX_BASE_DIR="${BASE_DIR}"
+		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
+		local oclsuffix=32
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+	# To make sure we do not miss a spot when these change.
+	local libmajor=1 libminor=2
+	local libver=${libmajor}.${libminor}
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
+		libGL.so.${libver}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+
+	exeinto ${ATI_ROOT}/extensions
+	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+
+	# other libs
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed some row above
+	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
+	# DRI modules, installed into the path used by recent versions of mesa.
+	exeinto /usr/$(get_libdir)/dri
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+	# AMD Cal and OpenCL libraries
+	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
+	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
+	exeinto /usr/$(get_libdir)
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+
+	# OpenCL vendor files
+	insinto /etc/OpenCL/vendors/
+	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
+		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
+	EOF
+	doins "${T}"/amdocl${oclsuffix}.icd
+
+	local envname="${T}"/04ati-dri-path
+	if [[ -n ${ABI} ]]; then
+		envname="${envname}-${ABI}"
+	fi
+	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+	doenvd "${envname}"
+
+	# Silence the QA notice by creating missing soname symlinks
+	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
+	do
+		local soname=${so##*/}
+		## let's keep also this alternative way ;)
+		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
+		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
+	done
+}
+
+pkg_postinst() {
+	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
+	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+	elog
+	elog "If you experience unexplained segmentation faults and kernel crashes"
+	elog "with this driver and multi-threaded applications such as wine,"
+	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	elog
+	elog "Fully rebooting the system after an ${PN} update is recommended"
+	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+	elog "might not work"
+	elog
+	elog "Some cards need acpid running to handle events"
+	elog "Please add it to boot runlevel with rc-update add acpid boot"
+	elog
+
+	use modules && linux-mod_pkg_postinst
+	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
+	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
+}
+
+pkg_preinst() {
+	use modules && linux-mod_pkg_preinst
+}
+
+pkg_prerm() {
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use modules && linux-mod_pkg_postrm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
new file mode 100644
index 0000000..f9f480b
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
@@ -0,0 +1,613 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild,v 1.4 2012/05/28 09:12:53 mgorny Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
+
+DESCRIPTION="Ati precompiled drivers for radeon r600 (HD Series) and newer chipsets"
+HOMEPAGE="http://www.amd.com"
+# 8.ble will be used for beta releases.
+if [[ $(get_major_version) -gt 8 ]]; then
+	ATI_URL="http://www2.ati.com/drivers/linux/"
+	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
+	FOLDER_PREFIX="common/"
+else
+	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
+	FOLDER_PREFIX=""
+fi
+IUSE="debug +modules multilib pax_kernel qt4 static-libs"
+
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
+KEYWORDS="amd64 x86"
+SLOT="1"
+
+RDEPEND="
+	<=x11-base/xorg-server-1.11.49:=[-minimal]
+	>=app-admin/eselect-opengl-1.0.7
+	app-admin/eselect-opencl
+	sys-power/acpid
+	x11-apps/xauth
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	multilib? (
+			app-emulation/emul-linux-x86-opengl
+			app-emulation/emul-linux-x86-xlibs
+	)
+	qt4? (
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXfixes
+			x11-libs/libXxf86vm
+			x11-libs/qt-core
+			x11-libs/qt-gui
+	)
+"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+	x11-libs/libXtst
+	sys-apps/findutils
+	app-misc/pax-utils
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+# QA Silencing
+QA_TEXTRELS="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/libatiadlxx.so
+	usr/lib*/xorg/modules/glesx.so
+	usr/lib*/libaticaldd.so
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_EXECSTACK="
+	opt/bin/atiode
+	opt/bin/amdcccle
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_WX_LOAD="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+"
+
+QA_SONAME="
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
+"
+
+QA_DT_HASH="
+	opt/bin/amdcccle
+	opt/bin/aticonfig
+	opt/bin/atiodcli
+	opt/bin/atiode
+	opt/bin/clinfo
+	opt/bin/fglrxinfo
+	opt/sbin/atieventsd
+	opt/sbin/amdnotifyui
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libatiuki.so.1.0
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
+	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+"
+
+_check_kernel_config() {
+	local failed=0
+	local error=""
+	if ! kernel_is ge 2 6; then
+		eerror "You need a 2.6 linux kernel to compile against!"
+		die "No 2.6 Kernel found"
+	fi
+
+	if ! linux_chkconfig_present MTRR; then
+		ewarn "You don't have MTRR support enabled in the kernel."
+		ewarn "Direct rendering will not work."
+	fi
+
+	if linux_chkconfig_builtin DRM; then
+		ewarn "You have DRM support built in to the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present AGP && \
+		! linux_chkconfig_present PCIEPORTBUS; then
+		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present ACPI; then
+		eerror "${P} requires the ACPI support in the kernel"
+		eerror "Please enable it:"
+		eerror "    CONFIG_ACPI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Power management and ACPI options --->"
+		eerror "        [*] Power Management support"
+		eerror "in the 'menuconfig'"
+		error+=" CONFIG_ACPI disabled;"
+		failed=1
+	fi
+
+	if ! linux_chkconfig_present PCI_MSI; then
+		eerror "${P} requires MSI in the kernel."
+		eerror "Please enable it:"
+		eerror "    CONFIG_PCI_MSI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Bus options (PCI etc.)  --->"
+		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
+		eerror "in the kernel config."
+		error+=" CONFIG_PCI_MSI disabled;"
+		failed=1
+	fi
+
+	if linux_chkconfig_present LOCKDEP; then
+		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
+		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
+		eerror "This prevents ${P} from compiling with an error like this:"
+		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+		eerror "Please make sure the following options have been unset:"
+		eerror "    Kernel hacking  --->"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
+		eerror "in 'menuconfig'"
+		error+=" LOCKDEP enabled;"
+		failed=1
+	fi
+
+	use amd64 && if ! linux_chkconfig_present COMPAT; then
+		eerror "${P} requires COMPAT."
+		eerror "Please enable the 32 bit emulation:"
+		eerror "Executable file formats / Emulations  --->"
+		eerror "    [*] IA32 Emulation"
+		eerror "in the kernel config."
+		eerror "if this doesn't enable CONFIG_COMPAT add"
+		eerror "    CONFIG_COMPAT=y"
+		eerror "in /usr/src/linux/.config"
+		error+=" COMPAT disabled;"
+		failed=1
+	fi
+
+	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
+		eerror "${P} requires BKL."
+		eerror "Please enable the Big Kernel Lock:"
+		eerror "Kernel hacking  --->"
+		eerror "    [*] Big Kernel Lock"
+		eerror "in the kernel config."
+		eerror "or add"
+		eerror "    CONFIG_BKL=y"
+		eerror "in /usr/src/linux/.config"
+		error+=" BKL disabled;"
+		failed=1
+	fi
+
+	[[ ${failed} -ne 0 ]] && die "${error}"
+}
+
+pkg_pretend() {
+	# workaround until bug 365543 is solved
+	if use modules; then
+		linux-info_pkg_setup
+		require_configured_kernel
+		_check_kernel_config
+	fi
+}
+
+pkg_setup() {
+	if use modules; then
+		MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
+		BUILD_TARGETS="kmod_build"
+		linux-mod_pkg_setup
+		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
+		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+		if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+		else
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+		fi
+	fi
+	# Define module dir.
+	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+	# get the xorg-server version and set BASE_DIR for that
+	BASE_DIR="${S}/xpic"
+
+	# amd64/x86
+	if use amd64 ; then
+		MY_BASE_DIR="${BASE_DIR}_64a"
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		MY_BASE_DIR="${BASE_DIR}"
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+
+	elog
+	elog "Please note that this driver supports only graphic cards based on"
+	elog "r600 chipset and newer."
+	elog "This represent the AMD Radeon HD series at this moment."
+	elog
+	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
+	elog "For migration informations please reffer to:"
+	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+	einfo
+}
+
+src_unpack() {
+	if [[ $(get_major_version) -gt 8 ]]; then
+		# Switching to a standard way to extract the files since otherwise no signature file
+		# would be created
+		local src="${DISTDIR}/${A}"
+		sh "${src}" --extract "${S}"  2&>1 /dev/null
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# All kernel options for prepare are ment to be in here
+	if use modules; then
+		# version patches
+		# epatch "${FILESDIR}"/kernel/${PV}-*.patch
+		if use debug; then
+			sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+				"${MODULE_DIR}/firegl_public.c" \
+				|| die "Failed to enable debug output."
+		fi
+	fi
+
+	# These are the userspace utilities that we also have source for.
+	# We rebuild these later.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
+		|| die "bin rm failed"
+
+	# in this version amdcccle isn't static, thus we depend on qt4
+	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
+
+	# ACPI fixups
+	sed -i \
+		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+		-e "s:/var/lib/gdm/:/var/gdm/:" \
+		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
+		|| die "sed failed."
+
+	# Since "who" is in coreutils, we're using that one instead of "finger".
+	sed -i -e 's:finger:who:' \
+		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+		|| die "Replacing 'finger' with 'who' failed."
+	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+	# add function to detect default state.
+	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
+
+	# fix needed for at least hardened-sources, see bug #392753
+	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
+
+	# fixed fgrlx compilation error on 32-bit x86 arch with kernel 3.3-rc4 due to commit:
+	# https://github.com/torvalds/linux/commit/f94edacf998516ac9d849f7bc6949a703977a7f3
+	# later modified (in 3.3-rc5) by commit:
+	# https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8#diff-1
+	# and finally backported to kernel 3.2.8.
+	epatch "${FILESDIR}"/amd-drivers-3.2.7.1.patch
+
+	# see http://ati.cchtml.com/show_bug.cgi?id=495
+	epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
+
+	cd "${MODULE_DIR}"
+
+	# bugged fglrx build system, this file should be copied by hand
+	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+	cd "${S}"
+
+	mkdir extra || die "mkdir failed"
+	cd extra
+	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
+}
+
+src_compile() {
+	use modules && linux-mod_src_compile
+
+	ebegin "Building fgl_glxgears"
+	cd "${S}"/extra/fgl_glxgears
+	# These extra libs/utils either have an Imakefile that does not
+	# work very well without tweaking or a Makefile ignoring CFLAGS
+	# and the like. We bypass those.
+	# The -DUSE_GLU is needed to compile using nvidia headers
+	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
+	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+		-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
+		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+	eend $?
+}
+
+src_test() { :; } # no tests present
+
+src_install() {
+	use modules && linux-mod_src_install
+
+	# We can do two things here, and neither of them is very nice.
+
+	# For direct rendering libGL has to be able to load one or more
+	# dri modules (files ending in _dri.so, like fglrx_dri.so).
+	# Gentoo's mesa looks for these files in the location specified by
+	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
+	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+	# 64bit. So we can either put the .so files in that (unusual,
+	# compared to "normal" mesa libGL) location or set
+	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+	# 101539.
+
+	# The problem with this approach is that LIBGL_DRIVERS_PATH
+	# *overrides* the default hardcoded location, it does not extend
+	# it. So if ati-drivers is merged but a non-ati libGL is selected
+	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+	# (because it changed in a newer mesa or because it was compiled
+	# for a different set of multilib abis than we are) stuff breaks.
+
+	# We create one file per ABI to work with "native" multilib, see
+	# below.
+
+	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+	doenvd "${T}/03ati-colon-sep" || die
+
+	# All libraries that we have a 32 bit and 64 bit version of on
+	# amd64 are installed in src_install-libs. Everything else
+	# (including libraries only available in native 64bit on amd64)
+	# goes in here.
+
+	# There used to be some code here that tried to detect running
+	# under a "native multilib" portage ((precursor of)
+	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
+	# should just work (only doing some duplicate work). --marienz
+	if has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	# This is sorted by the order the files occur in the source tree.
+
+	# X modules.
+	exeinto /usr/$(get_libdir)/xorg/modules/drivers
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
+
+	# Arch-specific files.
+	# (s)bin.
+	into /opt
+	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+	use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
+	dobin "${ARCH_DIR}"/usr/bin/clinfo
+	# We cleaned out the compilable stuff in src_unpack
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
+
+	# Common files.
+	# etc.
+	insinto /etc/ati
+	exeinto /etc/ati
+	# Everything except for the authatieventsd.sh script.
+	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
+	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
+
+	# include.
+	insinto /usr
+	doins -r ${FOLDER_PREFIX}usr/include
+	insinto /usr/include/X11/extensions
+
+	# Just the atigetsysteminfo.sh script.
+	into /usr
+	dosbin ${FOLDER_PREFIX}usr/sbin/*
+
+	# data files for the control panel.
+	if use qt4 ; then
+		insinto /usr/share
+		doins -r ${FOLDER_PREFIX}usr/share/ati
+		insinto /usr/share/pixmaps
+		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
+		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
+			ccc_large System
+	fi
+
+	# doc.
+	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
+
+	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
+
+	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+	exeinto /etc/acpi
+	doexe ati-powermode.sh
+	insinto /etc/acpi/events
+	doins events/*
+
+	popd > /dev/null
+
+	# Done with the "source" tree. Install tools we rebuilt:
+	dobin extra/fgl_glxgears/fgl_glxgears
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears
+
+	# Gentoo-specific stuff:
+	newinitd "${FILESDIR}"/atieventsd.init atieventsd
+	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+	newconfd "${T}"/atieventsd.conf atieventsd
+
+	# PowerXpress stuff
+	exeinto /usr/$(get_libdir)/fglrx
+	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
+	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
+	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local EX_BASE_DIR="${BASE_DIR}_64a"
+		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
+		local oclsuffix=64
+	else
+		local EX_BASE_DIR="${BASE_DIR}"
+		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
+		local oclsuffix=32
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+	# To make sure we do not miss a spot when these change.
+	local libmajor=1 libminor=2
+	local libver=${libmajor}.${libminor}
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
+		libGL.so.${libver}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+
+	exeinto ${ATI_ROOT}/extensions
+	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+
+	# other libs
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed some row above
+	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
+	# DRI modules, installed into the path used by recent versions of mesa.
+	exeinto /usr/$(get_libdir)/dri
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+	# AMD Cal and OpenCL libraries
+	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
+	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
+	exeinto /usr/$(get_libdir)
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+
+	# OpenCL vendor files
+	insinto /etc/OpenCL/vendors/
+	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
+		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
+	EOF
+	doins "${T}"/amdocl${oclsuffix}.icd
+
+	local envname="${T}"/04ati-dri-path
+	if [[ -n ${ABI} ]]; then
+		envname="${envname}-${ABI}"
+	fi
+	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+	doenvd "${envname}"
+
+	# Silence the QA notice by creating missing soname symlinks
+	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
+	do
+		local soname=${so##*/}
+		## let's keep also this alternative way ;)
+		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
+		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
+	done
+
+	#remove static libs if not wanted
+	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
+}
+
+pkg_postinst() {
+	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
+	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+	elog
+	elog "If you experience unexplained segmentation faults and kernel crashes"
+	elog "with this driver and multi-threaded applications such as wine,"
+	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	elog
+	elog "Fully rebooting the system after an ${PN} update is recommended"
+	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+	elog "might not work"
+	elog
+	elog "Some cards need acpid running to handle events"
+	elog "Please add it to boot runlevel with rc-update add acpid boot"
+	elog
+
+	use modules && linux-mod_pkg_postinst
+	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
+	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
+}
+
+pkg_preinst() {
+	use modules && linux-mod_pkg_preinst
+}
+
+pkg_prerm() {
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use modules && linux-mod_pkg_postrm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild
new file mode 100644
index 0000000..78de29f
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild
@@ -0,0 +1,625 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.6.ebuild,v 1.1 2012/06/30 09:17:19 scarabeus Exp $
+
+EAPI="4-slot-abi"
+
+inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
+
+DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
+HOMEPAGE="http://www.amd.com"
+MY_V=( $(get_version_components) )
+if [[ ${MY_V[2]} != beta ]]; then
+	ATI_URL="http://www2.ati.com/drivers/linux/"
+	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
+	FOLDER_PREFIX="common/"
+else
+	#SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
+	SRC_URI="http://www2.ati.com/drivers/hotfix/catalyst_12.6_hotfixes/amd-driver-installer-8.98-x86.x86_64.zip"
+	FOLDER_PREFIX="common/"
+fi
+IUSE="debug +modules multilib pax_kernel qt4 static-libs"
+
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
+KEYWORDS="amd64 x86"
+SLOT="1"
+
+RESTRICT="bindist"
+
+RDEPEND="
+	<=x11-base/xorg-server-1.12.49:=[-minimal]
+	>=app-admin/eselect-opengl-1.0.7
+	app-admin/eselect-opencl
+	sys-power/acpid
+	x11-apps/xauth
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	multilib? (
+			app-emulation/emul-linux-x86-opengl
+			app-emulation/emul-linux-x86-xlibs
+	)
+	qt4? (
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXcursor
+			x11-libs/libXfixes
+			x11-libs/libXxf86vm
+			x11-libs/qt-core
+			x11-libs/qt-gui
+	)
+"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+	x11-libs/libXtst
+	sys-apps/findutils
+	app-misc/pax-utils
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+# QA Silencing
+QA_TEXTRELS="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/libatiadlxx.so
+	usr/lib*/xorg/modules/glesx.so
+	usr/lib*/libaticaldd.so
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_EXECSTACK="
+	opt/bin/atiode
+	opt/bin/amdcccle
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_WX_LOAD="
+	usr/lib*/opengl/ati/lib/libGL.so.1.2
+	usr/lib*/dri/fglrx_dri.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+"
+
+QA_SONAME="
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so
+"
+
+QA_DT_HASH="
+	opt/bin/amdcccle
+	opt/bin/aticonfig
+	opt/bin/atiodcli
+	opt/bin/atiode
+	opt/bin/clinfo
+	opt/bin/fglrxinfo
+	opt/sbin/atieventsd
+	opt/sbin/amdnotifyui
+	usr/lib\(32\|64\)\?/libaticalcl.so
+	usr/lib\(32\|64\)\?/libaticalrt.so
+	usr/lib\(32\|64\)\?/libatiuki.so.1.0
+	usr/lib\(32\|64\)\?/libatiadlxx.so
+	usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0
+	usr/lib\(32\|64\)\?/libXvBAW.so.1.0
+	usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0
+	usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so
+	usr/lib\(32\|64\)\?/xorg/modules/glesx.so
+	usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so
+	usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so
+	usr/lib\(32\|64\)\?/libaticaldd.so
+	usr/lib\(32\|64\)\?/dri/fglrx_dri.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so
+	usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2
+	usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so
+	usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1
+"
+
+_check_kernel_config() {
+	local failed=0
+	local error=""
+	if ! kernel_is ge 2 6; then
+		eerror "You need a 2.6 linux kernel to compile against!"
+		die "No 2.6 Kernel found"
+	fi
+
+	if ! linux_chkconfig_present MTRR; then
+		ewarn "You don't have MTRR support enabled in the kernel."
+		ewarn "Direct rendering will not work."
+	fi
+
+	if linux_chkconfig_builtin DRM; then
+		ewarn "You have DRM support built in to the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present AGP && \
+		! linux_chkconfig_present PCIEPORTBUS; then
+		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present ACPI; then
+		eerror "${P} requires the ACPI support in the kernel"
+		eerror "Please enable it:"
+		eerror "    CONFIG_ACPI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Power management and ACPI options --->"
+		eerror "        [*] Power Management support"
+		eerror "in the 'menuconfig'"
+		error+=" CONFIG_ACPI disabled;"
+		failed=1
+	fi
+
+	if ! linux_chkconfig_present PCI_MSI; then
+		eerror "${P} requires MSI in the kernel."
+		eerror "Please enable it:"
+		eerror "    CONFIG_PCI_MSI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Bus options (PCI etc.)  --->"
+		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
+		eerror "in the kernel config."
+		error+=" CONFIG_PCI_MSI disabled;"
+		failed=1
+	fi
+
+	if linux_chkconfig_present LOCKDEP; then
+		eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel."
+		eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only."
+		eerror "This prevents ${P} from compiling with an error like this:"
+		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
+		eerror "Please make sure the following options have been unset:"
+		eerror "    Kernel hacking  --->"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
+		eerror "in 'menuconfig'"
+		error+=" LOCKDEP enabled;"
+		failed=1
+	fi
+
+	use amd64 && if ! linux_chkconfig_present COMPAT; then
+		eerror "${P} requires COMPAT."
+		eerror "Please enable the 32 bit emulation:"
+		eerror "Executable file formats / Emulations  --->"
+		eerror "    [*] IA32 Emulation"
+		eerror "in the kernel config."
+		eerror "if this doesn't enable CONFIG_COMPAT add"
+		eerror "    CONFIG_COMPAT=y"
+		eerror "in /usr/src/linux/.config"
+		error+=" COMPAT disabled;"
+		failed=1
+	fi
+
+	kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then
+		eerror "${P} requires BKL."
+		eerror "Please enable the Big Kernel Lock:"
+		eerror "Kernel hacking  --->"
+		eerror "    [*] Big Kernel Lock"
+		eerror "in the kernel config."
+		eerror "or add"
+		eerror "    CONFIG_BKL=y"
+		eerror "in /usr/src/linux/.config"
+		error+=" BKL disabled;"
+		failed=1
+	fi
+
+	if linux_chkconfig_present X86_X32; then
+		eerror "You've enabled x32 in the kernel."
+		eerror "Unfortunately, this option is not supported yet and prevents the fglrx"
+		eerror "kernel module from loading."
+		error+=" X86_32 enabled;"
+		failed=1
+	fi
+
+	[[ ${failed} -ne 0 ]] && die "${error}"
+}
+
+pkg_pretend() {
+	# workaround until bug 365543 is solved
+	if use modules; then
+		linux-info_pkg_setup
+		require_configured_kernel
+		_check_kernel_config
+	fi
+}
+
+pkg_setup() {
+	if use modules; then
+		MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)"
+		BUILD_TARGETS="kmod_build"
+		linux-mod_pkg_setup
+		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
+		BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\""
+		if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
+		else
+			BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space"
+		fi
+	fi
+	# Define module dir.
+	MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod"
+	# get the xorg-server version and set BASE_DIR for that
+	BASE_DIR="${S}/xpic"
+
+	# amd64/x86
+	if use amd64 ; then
+		MY_BASE_DIR="${BASE_DIR}_64a"
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		MY_BASE_DIR="${BASE_DIR}"
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+
+	elog
+	elog "Please note that this driver supports only graphic cards based on"
+	elog "Evergreen chipset and newer."
+	elog "This represent the AMD Radeon HD 5400+ series at this moment."
+	elog
+	elog "If your card is older then use ${CATEGORY}/xf86-video-ati"
+	elog "For migration informations please reffer to:"
+	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+	einfo
+}
+
+src_unpack() {
+	if [[ ${MY_V[2]} == beta ]]; then
+		unpack ${A}
+		RUN="${S}/${A/%.zip/.run}"
+	else
+		RUN="${DISTDIR}/${A}"
+	fi
+	sh ${RUN} --extract "${S}" # 2>&1 > /dev/null || die
+}
+
+src_prepare() {
+	# All kernel options for prepare are ment to be in here
+	if use modules; then
+		# version patches
+		# epatch "${FILESDIR}"/kernel/${PV}-*.patch
+		if use debug; then
+			sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+				"${MODULE_DIR}/firegl_public.c" \
+				|| die "Failed to enable debug output."
+		fi
+	fi
+
+	# These are the userspace utilities that we also have source for.
+	# We rebuild these later.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \
+		|| die "bin rm failed"
+
+	# in this version amdcccle isn't static, thus we depend on qt4
+	use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle
+
+	# ACPI fixups
+	sed -i \
+		-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+		-e "s:/var/lib/gdm/:/var/gdm/:" \
+		"${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \
+		|| die "sed failed."
+
+	# Since "who" is in coreutils, we're using that one instead of "finger".
+	sed -i -e 's:finger:who:' \
+		"${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+		|| die "Replacing 'finger' with 'who' failed."
+	# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+	# add function to detect default state.
+	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
+
+	# fix needed for at least hardened-sources, see bug #392753
+	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
+
+	# see http://ati.cchtml.com/show_bug.cgi?id=495
+	epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
+
+	cd "${MODULE_DIR}"
+
+	# bugged fglrx build system, this file should be copied by hand
+	cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+	cd "${S}"
+
+	mkdir extra || die "mkdir failed"
+	cd extra
+	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
+
+	# Get rid of watermark. Oldest known reference:
+	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
+	ebegin "Disabling watermark"
+	driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+	for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
+		sed -i "s/${x}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
+	done
+	eend $? || die "Disabling watermark failed"
+}
+
+src_compile() {
+	use modules && linux-mod_src_compile
+
+	ebegin "Building fgl_glxgears"
+	cd "${S}"/extra/fgl_glxgears
+	# These extra libs/utils either have an Imakefile that does not
+	# work very well without tweaking or a Makefile ignoring CFLAGS
+	# and the like. We bypass those.
+	# The -DUSE_GLU is needed to compile using nvidia headers
+	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
+	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+		-I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \
+		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+	eend $?
+}
+
+src_test() { :; } # no tests present
+
+src_install() {
+	use modules && linux-mod_src_install
+
+	# We can do two things here, and neither of them is very nice.
+
+	# For direct rendering libGL has to be able to load one or more
+	# dri modules (files ending in _dri.so, like fglrx_dri.so).
+	# Gentoo's mesa looks for these files in the location specified by
+	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
+	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+	# 64bit. So we can either put the .so files in that (unusual,
+	# compared to "normal" mesa libGL) location or set
+	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+	# 101539.
+
+	# The problem with this approach is that LIBGL_DRIVERS_PATH
+	# *overrides* the default hardcoded location, it does not extend
+	# it. So if ati-drivers is merged but a non-ati libGL is selected
+	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+	# (because it changed in a newer mesa or because it was compiled
+	# for a different set of multilib abis than we are) stuff breaks.
+
+	# We create one file per ABI to work with "native" multilib, see
+	# below.
+
+	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+	doenvd "${T}/03ati-colon-sep" || die
+
+	# All libraries that we have a 32 bit and 64 bit version of on
+	# amd64 are installed in src_install-libs. Everything else
+	# (including libraries only available in native 64bit on amd64)
+	# goes in here.
+
+	# There used to be some code here that tried to detect running
+	# under a "native multilib" portage ((precursor of)
+	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
+	# should just work (only doing some duplicate work). --marienz
+	if has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	# This is sorted by the order the files occur in the source tree.
+
+	# X modules.
+	exeinto /usr/$(get_libdir)/xorg/modules/drivers
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so}
+
+	# Arch-specific files.
+	# (s)bin.
+	into /opt
+	dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
+	use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui
+	dobin "${ARCH_DIR}"/usr/bin/clinfo
+	# We cleaned out the compilable stuff in src_unpack
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/*
+
+	# Common files.
+	# etc.
+	insinto /etc/ati
+	exeinto /etc/ati
+	# Everything except for the authatieventsd.sh script.
+	doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
+	doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh
+
+	# include.
+	insinto /usr
+	doins -r ${FOLDER_PREFIX}usr/include
+	insinto /usr/include/X11/extensions
+
+	# Just the atigetsysteminfo.sh script.
+	into /usr
+	dosbin ${FOLDER_PREFIX}usr/sbin/*
+
+	# data files for the control panel.
+	if use qt4 ; then
+		insinto /usr/share
+		doins -r ${FOLDER_PREFIX}usr/share/ati
+		insinto /usr/share/pixmaps
+		doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm
+		make_desktop_entry amdcccle 'AMD Catalyst Control Center' \
+			ccc_large System
+	fi
+
+	# doc.
+	dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx
+
+	doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8
+
+	pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+	exeinto /etc/acpi
+	doexe ati-powermode.sh
+	insinto /etc/acpi/events
+	doins events/*
+
+	popd > /dev/null
+
+	# Done with the "source" tree. Install tools we rebuilt:
+	dobin extra/fgl_glxgears/fgl_glxgears
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears
+
+	# Gentoo-specific stuff:
+	newinitd "${FILESDIR}"/atieventsd.init atieventsd
+	echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+	newconfd "${T}"/atieventsd.conf atieventsd
+
+	# PowerXpress stuff
+	exeinto /usr/$(get_libdir)/fglrx
+	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
+	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
+	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local EX_BASE_DIR="${BASE_DIR}_64a"
+		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
+		local oclsuffix=64
+	else
+		local EX_BASE_DIR="${BASE_DIR}"
+		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
+		local oclsuffix=32
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+	# To make sure we do not miss a spot when these change.
+	local libmajor=1 libminor=2
+	local libver=${libmajor}.${libminor}
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \
+		libGL.so.${libver}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
+
+	exeinto ${ATI_ROOT}/extensions
+	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+	mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+
+	# other libs
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed some row above
+	doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
+	# DRI modules, installed into the path used by recent versions of mesa.
+	exeinto /usr/$(get_libdir)/dri
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+
+	# AMD Cal and OpenCL libraries
+	exeinto /usr/$(get_libdir)/OpenCL/vendors/amd
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so*
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so*
+	dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so
+	exeinto /usr/$(get_libdir)
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so*
+
+	# OpenCL vendor files
+	insinto /etc/OpenCL/vendors/
+	cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF
+		/usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so
+	EOF
+	doins "${T}"/amdocl${oclsuffix}.icd
+
+	local envname="${T}"/04ati-dri-path
+	if [[ -n ${ABI} ]]; then
+		envname="${envname}-${ABI}"
+	fi
+	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+	doenvd "${envname}"
+
+	# Silence the QA notice by creating missing soname symlinks
+	for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9])
+	do
+		local soname=${so##*/}
+		## let's keep also this alternative way ;)
+		#dosym ${soname} /usr/$(get_libdir)/${soname%.[0-9]}
+		dosym ${soname} /usr/$(get_libdir)/$(scanelf -qF "#f%S" ${so})
+	done
+
+	#remove static libs if not wanted
+	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a
+}
+
+pkg_postinst() {
+	elog "To switch to AMD OpenGL, run \"eselect opengl set ati\""
+	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
+	elog
+	elog "If you experience unexplained segmentation faults and kernel crashes"
+	elog "with this driver and multi-threaded applications such as wine,"
+	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	elog
+	elog "Fully rebooting the system after an ${PN} update is recommended"
+	elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg"
+	elog "might not work"
+	elog
+	elog "Some cards need acpid running to handle events"
+	elog "Please add it to boot runlevel with rc-update add acpid boot"
+	elog
+
+	use modules && linux-mod_pkg_postinst
+	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
+	"${ROOT}"/usr/bin/eselect opencl set --use-old amd
+}
+
+pkg_preinst() {
+	use modules && linux-mod_pkg_preinst
+}
+
+pkg_prerm() {
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use modules && linux-mod_pkg_postrm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}

diff --git a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch b/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
new file mode 100644
index 0000000..104c878
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
@@ -0,0 +1,19 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
+ #ifdef CONFIG_X86_64
+     kernel_fpu_begin();
+ #else
++#ifndef TS_USEDFPU
++    preempt_disable();
++    if (__thread_has_fpu(current))
++        __save_init_fpu(current);
++#else
+     struct thread_info *cur_task = current_thread_info();
+     preempt_disable();
+     if (cur_task->status & TS_USEDFPU)
+         __save_init_fpu(cur_task->task);
++#endif
+     else
+         clts();
+ #endif

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
new file mode 100644
index 0000000..f4fab43
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
@@ -0,0 +1,42 @@
+--- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig	2012-03-08 19:30:38.195025328 +0100
++++ common/lib/modules/fglrx/build_mod/kcl_debug.h	2012-03-08 19:31:24.976024507 +0100
+@@ -85,8 +85,8 @@
+ #ifdef ERROR
+ #undef ERROR
+ #endif
+-#ifdef WARN
+-#undef WARN
++#ifdef AMD_WARN
++#undef AMD_WARN
+ #endif
+ #ifdef INFO
+ #undef INFO
+@@ -122,7 +122,7 @@
+ {
+     SPECIAL = 0,
+     ERROR  ,
+-    WARN  ,
++    AMD_WARN  ,
+     INFO ,
+     INFOEX,
+     TRACE,
+@@ -160,7 +160,7 @@
+ }log_map;
+ 
+ 
+-#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
++#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL)  ))
+ #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
+ extern const log_map module_log_map[];
+ extern const module_map module_type_map[];
+--- common/lib/modules/fglrx/build_mod/kcl_debug.c.orig	2012-03-08 19:36:18.244019310 +0100
++++ common/lib/modules/fglrx/build_mod/kcl_debug.c	2012-03-08 19:36:36.197018973 +0100
+@@ -69,7 +69,7 @@
+ {
+     {SPECIAL        ,   'S'},
+     {ERROR          ,   'E'},
+-    {WARN           ,   'W'},
++    {AMD_WARN           ,   'W'},
+     {INFO           ,   'I'},
+     {INFOEX         ,   'X'},
+     {TRACE          ,   'T'},

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
new file mode 100644
index 0000000..0456bd6
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-old_rsp.patch
@@ -0,0 +1,24 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:33:25.044695179 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-05-26 18:28:39.692699095 +0200
+@@ -4154,7 +4154,7 @@
+ {
+     unsigned int p;
+     KCL_DEBUG5(FN_FIREGL_KAS, "%d\n", level_init);
+-    for_each_cpu_mask(p, cpu_possible_map)
++    for_each_possible_cpu(p)
+     {
+         KCL_DEBUG1(FN_FIREGL_KAS,"Setting initial execution level for CPU # %d\n", p);
+         preempt_disable();
+--- a/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:11:03.402987821 +0200
++++ b/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2012-05-26 19:13:00.273986422 +0200
+@@ -217,6 +217,10 @@
+  *  \param size [in] Number of bytes to allocate
+  *  \return Pointer to allocated memory
+  */
++#ifndef CONFIG_X86_X32
++DEFINE_PER_CPU(unsigned long, old_rsp);
++#endif
++
+ void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
+ {
+     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
\ No newline at end of file

diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch
new file mode 100644
index 0000000..f5a35a3
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch
@@ -0,0 +1,42 @@
+diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh
+--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-07-28 04:22:36.000000000 +0100
++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh	2006-08-04 12:19:42.000000000 +0100
+@@ -4,6 +4,8 @@
+ # Control script for ACPI lid state and AC adapter state
+ #
+ 
++aticonfig='/opt/bin/aticonfig'
++
+ getXuser() {
+         user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
+         if [ x"$user" = x"" ]; then
+@@ -47,7 +49,7 @@
+ done
+ 
+ #If PPLIB is enabled
+-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB
++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB
+ if [ $? = 0 ]; then
+    echo "Has PPLIB"
+    has_pplib=1
+@@ -61,15 +63,15 @@
+ if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
+     echo "Low power"
+     if [ ${has_pplib} -eq 1 ]; then
+-        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"'
++        su $user -c '$aticonfig --pplib-cmd="notify psrc dc"'
+     else
+-        su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
++        su $user -c "$aticonfig --set-powerstate=1"
+     fi
+ else
+     echo "high power"
+     if [ ${has_pplib} -eq 1 ]; then
+-        su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"'
++        su $user -c '$aticonfig --pplib-cmd="notify psrc ac"'
+     else
+-        su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
++	su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)"
+     fi
+ fi
+

diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init
new file mode 100644
index 0000000..73139ce
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/atieventsd.init
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.3 2007/05/18 23:58:01 marienz Exp $
+
+depend() {
+    need acpid
+}
+
+start() {
+    ebegin "Starting ${SVCNAME}"
+    start-stop-daemon --start --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${SVCNAME}"
+    start-stop-daemon --stop --quiet --exec /opt/sbin/atieventsd
+    eend $?
+}
\ No newline at end of file

diff --git a/x11-drivers/ati-drivers/files/switchlibGL b/x11-drivers/ati-drivers/files/switchlibGL
new file mode 100644
index 0000000..a6aa4fc
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/switchlibGL
@@ -0,0 +1,61 @@
+#!/bin/bash
+#  switchlibGL
+#
+#  Copyright (c) 2011 Advanced Micro Devices, Inc.
+#
+#  Purpose:
+#    For switch between AMD and Intel graphic driver library.
+#
+#  Usage:
+#  switchlibGL   amd|intel|query
+#    amd:   switches to the AMD version of libGL.
+#    intel: switches to the open-source version of libGL .
+#    query: checks, which version is currently active and prints either "amd"
+#    or "intel" or "unknown" on the standard output.
+#    must be root to execute this script
+
+ARCH=`uname -m`
+E_ERR=1
+
+# Check if root
+if [ "`whoami`" != "root" ]; then
+  echo "Must be root to run this script." 1>&2
+  exit $E_ERR
+fi
+
+# One parameter
+if [ $# -ne 1 ]; then
+  echo "Usage: `basename $0` amd|intel|query " 1>&2
+  echo "Please choose one parameter " 1>&2
+  exit $E_ERR
+fi
+
+current=$(eselect opengl show)
+# Switch to right mode
+case "$1" in
+	"amd" )
+		if [ $current != ati ] ; then
+			eselect opengl set ati || return 1
+		fi
+	;;
+	"intel" )
+		if [ $current != xorg-x11 ] ; then
+			eselect opengl set xorg-x11 || return 1
+		fi
+	;;
+	"query" )
+		case "$current" in
+			"ati" )
+				echo "amd"
+			;;
+			"xorg-x11" )
+				echo "intel"
+			;;
+		esac
+	;;
+	* ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
+	# other than amd|intel|query parameter report an error
+esac
+
+#  A zero return value from the script upon exit indicates success.
+exit 0

diff --git a/x11-drivers/xf86-input-acecad/Manifest b/x11-drivers/xf86-input-acecad/Manifest
new file mode 100644
index 0000000..a533074
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-input-acecad-1.4.0.tar.bz2 255888 RMD160 3794aa5fb1f0becedac129117e0842122c92a541 SHA1 4182aa30d4209ec60fd423a3e24e4951e16c0a4b SHA256 48341d8b6b0060228134b36543986c949ea828d6ce6d0484d29b3dde9ddbd556
+DIST xf86-input-acecad-1.5.0.tar.bz2 262818 RMD160 ee4cf72d21026465cbe0611ee63aa3d070719bea SHA1 410cee68e4435dc95774fb389fcefae1b2ffe3d1 SHA256 c3032f38a07b54772299ce8832e16109a685ee63eeefbb17cef9fe1dd100a448
+EBUILD xf86-input-acecad-1.4.0.ebuild 508 RMD160 0fad63abbf79ae1498e78a02e9f2c07e6d031f40 SHA1 523ce76e0cafb582f2f17f29350fd1f381ac2b18 SHA256 7066b363ff1d85e4c27309ce2ed015d446a06b3c61aef19b3d6ec0e1e8bf891a
+EBUILD xf86-input-acecad-1.5.0.ebuild 443 RMD160 f75d916b337704dfd8b191af90865327355a3438 SHA1 3d23e67653781d0fb72599138ae8ef953d960fc7 SHA256 df8033f3b1719ae63a16743893d6c1af2a8606484b70e1a346bbaae78435e1f8
+MISC ChangeLog 4165 RMD160 090717632c49db23f5634977bf9f007b7a8a7100 SHA1 d36cce0bbc330141409683e51ed435fe18815926 SHA256 d151accb16b87df9179e6e21a90790f69fa2a9293cd140603fe89788d539d591
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.4.0.ebuild b/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.4.0.ebuild
new file mode 100644
index 0000000..d06c8ae
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.4.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.4.0.ebuild,v 1.8 2009/12/15 19:24:16 ranger Exp $
+
+inherit x-modular
+
+DESCRIPTION="Acecad Flair input driver"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99.901"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.5.0.ebuild b/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.5.0.ebuild
new file mode 100644
index 0000000..ab84bbc
--- /dev/null
+++ b/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.5.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-acecad/xf86-input-acecad-1.5.0.ebuild,v 1.9 2012/05/16 00:22:40 aballier Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Acecad Flair input driver"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-aiptek/Manifest b/x11-drivers/xf86-input-aiptek/Manifest
new file mode 100644
index 0000000..8c1bb48
--- /dev/null
+++ b/x11-drivers/xf86-input-aiptek/Manifest
@@ -0,0 +1,8 @@
+DIST xf86-input-aiptek-1.3.1.tar.bz2 270342 RMD160 c385187a8e9f88ca43d69bd0ab5990fd5188c92a SHA1 8466910dd3877502eb97468db4deab98d49125bb SHA256 43594db310572cfe81383d53934c373638e8be57dc01b34573b4183d0ef1eb9a
+DIST xf86-input-aiptek-1.4.0.tar.bz2 294358 RMD160 62aba2e06efabbf5bca043f9f7300383aeec7364 SHA1 19b7d42f35aff866de96d95941dce2b4682ad923 SHA256 94a2988f4c1dd5cb3a551fd0f9efa5c535a07f92e6e880676979e08e564c9e84
+DIST xf86-input-aiptek-1.4.1.tar.bz2 294033 RMD160 149d8ba2ec576904e14f4b4409134aeaf6b97c85 SHA1 55ea7d12d3e24fd72eacc966a59262864dce7769 SHA256 ba2223cd4a537275e11c54974094252d053b490a2b663af3a2b7e3038b3cf65f
+EBUILD xf86-input-aiptek-1.3.1.ebuild 516 RMD160 5c0c95708561864ff6b1d2dd09880c831e60ba8d SHA1 796ead958b9c928876f841b1eb44f63a05575ea9 SHA256 17747a6fe4bcc34a8c6746a85f8ca9c7c08d9c862ceacdc6a62fad75d3e41d9e
+EBUILD xf86-input-aiptek-1.4.0.ebuild 438 RMD160 e228f27e8686828c4499cf7f17ea63825cd76777 SHA1 58c287417d760fc73aa09b0fe2daa74d570a5195 SHA256 bfec95f31058d80b18954e9f2817baa47de3a07e3da87629a5637dad094d1bc7
+EBUILD xf86-input-aiptek-1.4.1.ebuild 441 RMD160 fda556c059541f8bd15ec636e7b135fad12db764 SHA1 5654663665a0d12456bb57142d60975728e855f4 SHA256 fe4d465af8073168ade4c182a3f2edd607fc2120f02a68e36fe0b5b72f3161bc
+MISC ChangeLog 9476 RMD160 05de29cc61f0d462346c34cea0845e384f3e2050 SHA1 2718fdfc5078a082c40063d6fccced97d2df1a8e SHA256 07737c97de6533a0fbb93f8da815a5a8f89fb617eb20de962c58ed4ee113e514
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.3.1.ebuild b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.3.1.ebuild
new file mode 100644
index 0000000..4d11f35
--- /dev/null
+++ b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.3.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.3.1.ebuild,v 1.8 2011/02/14 23:56:23 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Aiptek USB Digital Tablet Input Driver for Linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.0.ebuild b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.0.ebuild
new file mode 100644
index 0000000..4c3df3b
--- /dev/null
+++ b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.0.ebuild,v 1.8 2011/08/20 15:51:48 jer Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Aiptek USB Digital Tablet Input Driver for Linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1.ebuild b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1.ebuild
new file mode 100644
index 0000000..0f7d128
--- /dev/null
+++ b/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1.ebuild,v 1.7 2011/10/03 18:00:43 josejx Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Aiptek USB Digital Tablet Input Driver for Linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-evdev/Manifest b/x11-drivers/xf86-input-evdev/Manifest
new file mode 100644
index 0000000..5984f5e
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/Manifest
@@ -0,0 +1,7 @@
+AUX xf86-input-evdev-2.7.0-horizontal-scrolling.patch 1038 RMD160 79906e135babfcf1617d21c7d9f7bddb1bc5a805 SHA1 e959e710d9a0c60a3af967148b9d5e014544993c SHA256 7f02a9250ca5cd960073d91891a66e00bd1a15766544ba86bb307b568bfe37b1
+DIST xf86-input-evdev-2.6.0.tar.bz2 322773 RMD160 cde3345f882a4774dffe3ec9c716ef077f25febf SHA1 fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0 SHA256 b0e7f3991a8183a4743196c3e16d7184d439b80bf43653aa2f45b0756a6753ac
+DIST xf86-input-evdev-2.7.0.tar.bz2 360116 RMD160 39c6ba04aa44bd3123bbfece2c2155e4cafe6f86 SHA1 f0cb2d8400c33e8e83b538b53512e77ba73367fa SHA256 3ee1feee0ccf748005ca30b0993d0c1b80f85158b726745f9e0cb220902d6ec7
+EBUILD xf86-input-evdev-2.6.0.ebuild 515 RMD160 2fe07ffcac3e5b1b2398c68e131b73f4ddf06ed7 SHA1 1c2f68cf7bad7df95a0ad005328b121ead73e121 SHA256 7ee3b5d367faa080ccf42f907b8dd7ba673c351755017e9f8cdf60f75d994b9f
+EBUILD xf86-input-evdev-2.7.0.ebuild 603 RMD160 e8a09e3b7ffd3e4efc78a8ddd6e6c20fa4b82a28 SHA1 19cdc94bac8b51b4da18b792a6a40af0a6cb7430 SHA256 745cfd623718574bc16bafb82f0c825953b98d31f8d8b431d1f95af4d4420eff
+MISC ChangeLog 28391 RMD160 873b67f21791fb42cc1d6ca98bd596daa24f9184 SHA1 db37d0fc86346eb56c682b8b8f994cf8432b0d01 SHA256 3e6588dd7245cf905622a37f2d7540b9bcc358b0c90f833b657f1051fc37a899
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-evdev/files/xf86-input-evdev-2.7.0-horizontal-scrolling.patch b/x11-drivers/xf86-input-evdev/files/xf86-input-evdev-2.7.0-horizontal-scrolling.patch
new file mode 100644
index 0000000..93c54d3
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/files/xf86-input-evdev-2.7.0-horizontal-scrolling.patch
@@ -0,0 +1,27 @@
+From 99340147b9092a5aaec997eca407282a51e1f063 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@×××××.net>
+Date: Thu, 15 Mar 2012 05:46:32 +0000
+Subject: Fix inverted horizontal scroll (#46205)
+
+REL_HWHEEL has a positive increment, not a negative one like REL_WHEEL.
+
+X.Org Bug 46205 <http://bugs.freedesktop.org/show_bug.cgi?id=46205>
+
+Signed-off-by: Peter Hutterer <peter.hutterer@×××××.net>
+Reviewed-by: Chase Douglas <chase.douglas@×××××××××.com>
+---
+diff --git a/src/evdev.c b/src/evdev.c
+index d540b87..8cf630c 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -1600,7 +1600,7 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
+         else if (axis == REL_DIAL)
+             SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE);
+         else if (axis == REL_HWHEEL)
+-            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, -1.0, SCROLL_FLAG_NONE);
++            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE);
+ #endif
+     }
+ 
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.6.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.6.0.ebuild
new file mode 100644
index 0000000..932a062
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.6.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.6.0.ebuild,v 1.7 2011/03/05 18:09:14 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="Generic Linux input driver"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.6.3"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6
+	x11-proto/inputproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild
new file mode 100644
index 0000000..673c71e
--- /dev/null
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.7.0.ebuild,v 1.10 2012/06/29 04:10:07 maekke Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Generic Linux input driver"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server[udev]
+	sys-libs/mtdev"
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-2.1.99.3
+	>=sys-kernel/linux-headers-2.6"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.0-horizontal-scrolling.patch
+)

diff --git a/x11-drivers/xf86-input-fpit/Manifest b/x11-drivers/xf86-input-fpit/Manifest
new file mode 100644
index 0000000..884e585
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/Manifest
@@ -0,0 +1,7 @@
+AUX xf86-input-fpit-1.3.0-abi.patch 3343 RMD160 810d5c7382d656ec429248ec69ee4504d8250fec SHA1 dfb5bdfd0110b1d3c31229312ca1ec70e1a774b9 SHA256 bcce6cc3a58692913d6752b80e8db409e167beae5d8e1b868fd123ffb9b3cb5c
+DIST xf86-input-fpit-1.3.0.tar.bz2 243747 RMD160 46392fb8f7e40120f36b1c42e3b15702ecb5ecee SHA1 bc80c546c1b7838754a02a99391dbe31e5f1c475 SHA256 d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8
+DIST xf86-input-fpit-1.4.0.tar.bz2 277843 RMD160 bf175ce8491f13d032e03ee6808c0f845f888e18 SHA1 9305d30ae22d37c6b5bb975adc8ecda9b1d6c5e6 SHA256 38a80ad6e9b367e068390b2ef92e0bbb9c21c09ea835a5190ae14c2271e68f9a
+EBUILD xf86-input-fpit-1.3.0-r1.ebuild 632 RMD160 6cdac980361ec2f4646f8b30ef0054c6663aab8f SHA1 5625e7dfbbfd1a3897faafb5fe0a61ab3e35feec SHA256 afe22405660657a7b177fdfc8b1023554496fcd98bb8da4400fb4729865dde8f
+EBUILD xf86-input-fpit-1.4.0.ebuild 449 RMD160 78093847cbaf7ae6d508a765b8bb29611ee2071c SHA1 beece530a65f7f1bc7a81166d0c638e6832574ed SHA256 7ce45ecb4c443e2927d27bf40b0e977cd6d0d80bed730b9b2631452158687589
+MISC ChangeLog 9643 RMD160 2b449367f54190e239c5971765a03e54352cbe39 SHA1 3d4eae628874f658e6df2688033ef6891bf66600 SHA256 53e2752bed513c0a1c1fc533815ee5169380ae9c8cec9422c3e5d4d19e1f98f6
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-1.3.0-abi.patch b/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-1.3.0-abi.patch
new file mode 100644
index 0000000..a9864e2
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/files/xf86-input-fpit-1.3.0-abi.patch
@@ -0,0 +1,95 @@
+From 7d203627e7e3e7a6f8d0e847ed650b0b89760c09 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@×××××.net>
+Date: Fri, 17 Jul 2009 14:38:31 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+---
+ src/xf86Fpit.c |   40 +++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 35 insertions(+), 5 deletions(-)
+
+diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
+index 528ebb9..f40c6a9 100644
+--- a/src/xf86Fpit.c
++++ b/src/xf86Fpit.c
+@@ -188,6 +188,9 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)
+ 	 * screen to fit one meter.
+ 	 */
+ 	int quarter_turns;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++        Atom axis_labels[2] = { 0, 0 };
++#endif
+ 
+ 	priv->screen_width = screenInfo.screens[priv->screen_no]->width;
+ 	priv->screen_height = screenInfo.screens[priv->screen_no]->height;
+@@ -212,14 +215,30 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)
+ 	}
+ 
+ 	if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) {
+-		InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
++		InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				       axis_labels[1],
++#endif
++				       priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
+ 				       9500 /* max_res */ );
+-		InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
++		InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				       axis_labels[0],
++#endif
++				       priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
+ 				       10500 /* max_res */ );
+ 	} else {
+-		InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
++		InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				       axis_labels[0],
++#endif
++				       priv->fpitMinY, priv->fpitMaxY, 9500, 0 /* min_res */ ,
+ 				       9500 /* max_res */ );
+-		InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
++		InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				       axis_labels[1],
++#endif
++				       priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
+ 				       10500 /* max_res */ );
+ 	}
+ }
+@@ -408,6 +427,10 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ 	unsigned char map[] = {
+ 		0, 1, 2, 3 /* DMC: changed this so we can use all three buttons */
+ 	};
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++	Atom btn_labels[3] = { 0 };
++	Atom axis_labels[2] = { 0, 0 };
++#endif
+ 
+ 
+ 	switch (mode) {
+@@ -420,7 +443,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ 			/*
+ 			 * Device reports button press for up to 3 buttons.
+ 			 */
+-			if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) {
++			if (InitButtonClassDeviceStruct(dev, 3,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				      btn_labels,
++#endif
++				      map) == FALSE) {
+ 				ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n");
+ 				return !Success;
+ 			}
+@@ -435,6 +462,9 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ 			}
+ 	      
+ 			if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				      axis_labels,
++#endif
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+                                     xf86GetMotionEvents,
+ #endif
+-- 
+1.6.3.rc1.2.g0164.dirty
+

diff --git a/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild b/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild
new file mode 100644
index 0000000..a05fc5b
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.3.0-r1.ebuild,v 1.7 2011/02/14 23:56:24 xarthisius Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=4
+
+inherit x-modular
+
+DESCRIPTION="Fujitsu Stylistic input driver"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+PATCHES=( "${FILESDIR}/${P}-abi.patch" )

diff --git a/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.4.0.ebuild b/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.4.0.ebuild
new file mode 100644
index 0000000..9c5fa40
--- /dev/null
+++ b/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.4.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-fpit/xf86-input-fpit-1.4.0.ebuild,v 1.8 2012/05/16 00:24:52 aballier Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Fujitsu Stylistic input driver"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-hyperpen/Manifest b/x11-drivers/xf86-input-hyperpen/Manifest
new file mode 100644
index 0000000..2db0902
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-input-hyperpen-1.3.0.tar.bz2 236593 RMD160 884701e64960fd91ad01f58224bfb992b3155fa5 SHA1 c508f7d713d9127b6ad906f347c4760825a612e5 SHA256 e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
+DIST xf86-input-hyperpen-1.4.1.tar.bz2 266891 RMD160 500b2bff3b91fbdc3814c32dbdef88e553ba2b2a SHA1 4a3555310e812dc895b7493b11f7377314c36a75 SHA256 31a816f032a2adf4be10909811831191a7528152347e1726b04810ff88436816
+EBUILD xf86-input-hyperpen-1.3.0.ebuild 585 RMD160 79ea9e3772c7a960a8fb0f00f10e3832316e466e SHA1 e6383611481b4d33f4393ca8eb4d81ee2087c28a SHA256 ae02780ead848c68bd788f6ddb4590588638e6d8003bb8c65722a7e10c902443
+EBUILD xf86-input-hyperpen-1.4.1.ebuild 460 RMD160 0245c0372daed04705cdd851f262aa0d8ce4c661 SHA1 2abb706aabf710ef0ef1628eb50720fa2c08772c SHA256 712f849b9d4ce0067d4db50225c9b9b57d77cff8573bae8e2a054ec644fb4f63
+MISC ChangeLog 7531 RMD160 698ec3aaf584a130fe6c68fe3ae28a7cf894562b SHA1 9aec8cacd1e7497cb8c0841a33c443ae03d14df5 SHA256 59849d5406ec126e6f8401b52f41ca426875f0aeadf9b26d02452575187b83ea
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.3.0.ebuild b/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.3.0.ebuild
new file mode 100644
index 0000000..9af669b
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.3.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.3.0.ebuild,v 1.9 2009/12/15 19:26:10 ranger Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=4
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for hyperpen input devices"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.4.1.ebuild b/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.4.1.ebuild
new file mode 100644
index 0000000..15cb937
--- /dev/null
+++ b/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.4.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-hyperpen/xf86-input-hyperpen-1.4.1.ebuild,v 1.8 2012/05/16 00:25:10 aballier Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for hyperpen input devices"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-joystick/Manifest b/x11-drivers/xf86-input-joystick/Manifest
new file mode 100644
index 0000000..adbc22b
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/Manifest
@@ -0,0 +1,8 @@
+DIST xf86-input-joystick-1.5.0.tar.bz2 283763 RMD160 9266c2772f0eeb20e8bab47e570794f2af76d7be SHA1 a9fed6827d55f59b7166185247952049b4e6d152 SHA256 718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
+DIST xf86-input-joystick-1.6.0.tar.bz2 310552 RMD160 7c4759c6e79c5d99a1da28deb0fdd55fc77257f7 SHA1 3b9aed1b8128e1fbd947fdcdd5e16efccad1c780 SHA256 4f1c15ec7372dd340ec7e1a8ca19d75148896ee3883184c3663cbaa12cf738f1
+DIST xf86-input-joystick-1.6.1.tar.bz2 323230 RMD160 cf86b741d112e8fde0e984b07af7f8071ef2232b SHA1 0712652ec6cdb2fca6ad888548b232a4de9cf580 SHA256 1ded5d8f990a7687c44b45f68ad4a516f14fa94efa9da436955011ee6a9bf7f5
+EBUILD xf86-input-joystick-1.5.0.ebuild 495 RMD160 1058778beacd367786f5846087f2091159e81edb SHA1 735274994db36687f1aec3a4719669eef7c21315 SHA256 d2e7e2426ac182c650eef6221491e824f4a76acf7c67f228cb769d1c828b5216
+EBUILD xf86-input-joystick-1.6.0.ebuild 511 RMD160 5444b5a53f3ecac3e2ae88fd7a45af5871537897 SHA1 87519dc762a9b076c3dcda9f47feae89ff47eb88 SHA256 03439012f29b3a68e423d8ac8dd855d52ec2ee4d6a00dee7ca100488a7aae47e
+EBUILD xf86-input-joystick-1.6.1.ebuild 532 RMD160 e877bbdf1c74c3225f730cbdef4540ac0bc644cd SHA1 065cd12d05af68c4529e91967335a7ba579057b9 SHA256 8359fc1cfbb40dbf917b30a194a99bed2a69fb8386d5a2127d9b3e96e84d30c3
+MISC ChangeLog 14122 RMD160 a0399ddec6ea9c39b47113ea963fdf3d11d5f668 SHA1 28a5b4e40fe00eb1088cb344b941b3b5eba3ad49 SHA256 21bcef77db29b792da1c4d551cf8bbe0c1d36b9ba256d481da9ed5549c2414df
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.5.0.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.5.0.ebuild
new file mode 100644
index 0000000..46581f3
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.5.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.5.0.ebuild,v 1.8 2010/02/11 18:27:52 jer Exp $
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for joystick input devices"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.6"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto"

diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.0.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.0.ebuild
new file mode 100644
index 0000000..6e48e2b
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.0.ebuild,v 1.8 2011/08/20 15:52:01 jer Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for joystick input devices"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.10"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto"

diff --git a/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild
new file mode 100644
index 0000000..e152024
--- /dev/null
+++ b/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.1.ebuild,v 1.6 2012/06/29 04:12:46 maekke Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for joystick input devices"
+
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.10"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto"

diff --git a/x11-drivers/xf86-input-keyboard/Manifest b/x11-drivers/xf86-input-keyboard/Manifest
new file mode 100644
index 0000000..ca2d0dd
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-input-keyboard-1.6.0.tar.bz2 297675 RMD160 453e8c007b34e0f11164c507518774ed07adb521 SHA1 8e845086749f8c4b64fdfa852b4b26cf7bb62dc9 SHA256 c46c790fec905d696573b7a374b10ab8b4389112a8f69993fe011006c99e858e
+DIST xf86-input-keyboard-1.6.1.tar.bz2 304166 RMD160 72211dc8ec05ad93ee0fb9050b760ead7162458c SHA1 ef30fecb9e846a5268ae339846401489a785e413 SHA256 aa9ec96e7f7f87bc086cb86b871ee6f4b9a7809fb1e7d50d0abbd7c2e50a8cc3
+EBUILD xf86-input-keyboard-1.6.0.ebuild 544 RMD160 fa913d1d4d4109931954dbad77f4b85bb407e834 SHA1 fc3afa6d08a756d9b1b45494be235fea88c0be8c SHA256 d4e3e875c6eff368161b1f5f8c90b23cd7ca8697b9ee05d17499c7505193f4c3
+EBUILD xf86-input-keyboard-1.6.1.ebuild 480 RMD160 869deb5e11d734eed893300c9e84bc1675852a6a SHA1 d7245f4515db0b798d1b3987908defc47d62c5dd SHA256 fe78575700f0e40529309e0f02e5df401d93ceb0ef0e06fb3324e34c7c7d40b8
+MISC ChangeLog 12991 RMD160 5392e653b788c16697f275d6dcdf5e027f0ba40c SHA1 5b2b96003b68f1d6d86dab92ddd98cf7d5d74347 SHA256 f9e0e7e4e21e2869b40ff71a611e934991ace49fea7b021f73f8ecb9a76c192f
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.0.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.0.ebuild
new file mode 100644
index 0000000..0d7d925
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.0.ebuild,v 1.7 2011/04/16 17:59:14 armin76 Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Keyboard input driver"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.6.3"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild
new file mode 100644
index 0000000..147b0c9
--- /dev/null
+++ b/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-keyboard/xf86-input-keyboard-1.6.1.ebuild,v 1.6 2012/06/29 04:15:16 maekke Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Keyboard input driver"
+
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.6.3"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-mouse/Manifest b/x11-drivers/xf86-input-mouse/Manifest
new file mode 100644
index 0000000..a4681ac
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/Manifest
@@ -0,0 +1,8 @@
+DIST xf86-input-mouse-1.7.0.tar.bz2 319953 RMD160 868722bf50ad73ee3860f693276db184c4bb3845 SHA1 8b99054e5e4feafd7e08c87b936e64386b74ae8f SHA256 4e989542b5e9e0c5f9087288b18e70de1064dd27c83a4bc6dce58f3ea9d74994
+DIST xf86-input-mouse-1.7.1.tar.bz2 319429 RMD160 27ec9a6578b2fb97e135afb991b0ff73dc656da4 SHA1 11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed SHA256 d2c5b4b9bf03f8f7ef7b37bab25197d3f99a4d889c61bb67a68df33ec2c2ff12
+DIST xf86-input-mouse-1.7.2.tar.bz2 341378 RMD160 467870d6b65decc832fadf66896d613456f217cd SHA1 0da6390c6f3d7d636110a52f08193739929ae4ae SHA256 332b7357c18e6b9daba51c8ed48ce118e9b51fb5990b6a2a68637be62da7413b
+EBUILD xf86-input-mouse-1.7.0.ebuild 539 RMD160 b173fcd70db867b8089146e644167145939b4493 SHA1 0d77dfb94b0d0cc16327add8a9eff8b161fd32ab SHA256 3725d47c5ddaeb66102d9dcda9ec5c991d0058e824d0af1bd0d003552850ca42
+EBUILD xf86-input-mouse-1.7.1.ebuild 476 RMD160 dc053f53c6b540fb3ea3a69a0465ba47fcc6bb2c SHA1 c639e6281e1cf41dee955fb9b1c7e79e67e2bf61 SHA256 d339f58c55f39135260f58a7ac22d3b22ef3566580251f74ac3aae995a96572f
+EBUILD xf86-input-mouse-1.7.2.ebuild 494 RMD160 f76983f8175557b34a3f47448cba0cf5e18d636e SHA1 836f80b967a6b69e105c0103c4df7c26256a74d8 SHA256 a74f88cbb40f5e059648732bf32dadbf1cb24f8b2ed254ae506326f9cc2ad1f8
+MISC ChangeLog 15662 RMD160 333aed0b542d967b45ef3f649c56d053288517ef SHA1 59b589b72e087ada6ffa07422de8ff117d70b31e SHA256 e1e2ece988410eb751b752e9b5265d8bf00b0d648259303258b8afda4be24ce8
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.0.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.0.ebuild
new file mode 100644
index 0000000..42ffec5
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.0.ebuild,v 1.7 2011/04/16 18:00:16 armin76 Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for mouse input devices"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.5.99.901"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild
new file mode 100644
index 0000000..a8efeef
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.1.ebuild,v 1.7 2011/10/03 18:02:59 josejx Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for mouse input devices"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.5.99.901"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild
new file mode 100644
index 0000000..c6da5c1
--- /dev/null
+++ b/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mouse/xf86-input-mouse-1.7.2.ebuild,v 1.6 2012/06/29 04:17:50 maekke Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for mouse input devices"
+
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.5.99.901"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-mtrack/Manifest b/x11-drivers/xf86-input-mtrack/Manifest
new file mode 100644
index 0000000..12a457f
--- /dev/null
+++ b/x11-drivers/xf86-input-mtrack/Manifest
@@ -0,0 +1,9 @@
+AUX xf86-input-mtrack-0.1.1-autoconf.patch 2782 RMD160 3674bb1bc499ef2d00cc4bbd20683a00f4638d7c SHA1 3ff6544d74e16598f0206322e40067c331800315 SHA256 7794459081eddfbabd2a2cee4bcfd3aaa2e92e531ebda9fe78d063133dabdc3d
+AUX xf86-input-mtrack-0.1.1-export.patch 377 RMD160 9fb80bb749662fe3111a8a2baf946d7d606554bc SHA1 6fbfcef70c9ba1435101750e746cdcfb96ba78e9 SHA256 faf97d8a92d3c030ecac6ac77baeda486361f379ef1a8bf772292872d2e06909
+AUX xf86-input-mtrack-0.2.0-drop-mtrack-test.patch 370 RMD160 c803df71dc140e9a000378baf758d59b1dfc8980 SHA1 12da5dd76e2d50435cc274f4e2161701c993d45e SHA256 f9a154a0d07296c0976982582e1a3cce0ce1574b1b0447cab94a48ff70294236
+DIST xf86-input-mtrack-0.1.1.tar.gz 27907 RMD160 54e2366ec94faa957b3ca5bf5dc15c585e8f4232 SHA1 11341f5a469b4853b3439ef0635eb0ee6c4b0fbf SHA256 8daa3b40c85d951ddb9e3680551c0b07bd087f5533b4ded868b826b27a683a5d
+DIST xf86-input-mtrack-0.2.0.tar.gz 34892 RMD160 fd2c02b33d3c687532fc618ac0de776305a07c41 SHA1 6d3d621efd9f7679909ad77f32704f7cc3ede986 SHA256 7de4ccc78a81dfef06a4bc0f0d7e0e5cb65e12f3236a7fb427c4cadb1b326dff
+EBUILD xf86-input-mtrack-0.1.1-r1.ebuild 1204 RMD160 9b35ddbe8c13b7720f556929ce0ee92ae4285035 SHA1 e8689f1e4e4d7aab62b7c5c642151e792be2a876 SHA256 a878302c8471bb5f3c735e7ce8cb2ee73dae3cb7847c7439ad29fea23601d1ab
+EBUILD xf86-input-mtrack-0.2.0.ebuild 1193 RMD160 52659ba6255428d7ad9e79aae7bc0bf72b32f778 SHA1 314527c26d126942ce8a609a90e3a6c81282fa32 SHA256 ee05886c6ebf5661343355d30e1b4a2a3dcab95109de6432ab7c8388e2547f47
+MISC ChangeLog 1323 RMD160 4ed09784049f8afa8d4923f14b6ff2115853e58f SHA1 da1c55f17b247f2fcade7ff3855a8a95a9f9c299 SHA256 28f88f64a63d0f487a1fade31f8252dd6bd4ace9704df6fd688baaf834e31600
+MISC metadata.xml 217 RMD160 9d378f12203f968ce6579e725fe1bef901a63e0d SHA1 61ffb5324117463a58b1f5e594a93518fae59bd3 SHA256 321f736dfdb784484fc6e784c5430aa426d3a562b7ba934938d7fe8c2c603c63

diff --git a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-autoconf.patch b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-autoconf.patch
new file mode 100644
index 0000000..c9d87f1
--- /dev/null
+++ b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-autoconf.patch
@@ -0,0 +1,92 @@
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..af437a6
+--- /dev/null
++++ Makefile.am
+@@ -0,0 +1 @@
++SUBDIRS = src
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..4af69d9
+--- /dev/null
++++ configure.ac
+@@ -0,0 +1,57 @@
++#                                               -*- Autoconf -*-
++# Process this file with autoconf to produce a configure script.
++
++AC_PREREQ([2.60])
++AC_INIT([xf86-input-mtrack], [1.0_rc2], [BUG-REPORT-ADDRESS])
++AC_CONFIG_SRCDIR([driver/mtrack.c])
++AC_CONFIG_HEADERS([config.h])
++
++AM_INIT_AUTOMAKE([foreign])
++AM_MAINTAINER_MODE
++
++# Checks for programs.
++AC_DISABLE_STATIC
++AC_PROG_LIBTOOL
++
++# Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
++m4_ifndef([XORG_MACROS_VERSION],
++          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION([1.8])
++XORG_DEFAULT_OPTIONS
++
++# Obtain compiler/linker options from server and required extensions
++PKG_CHECK_MODULES(XORG, xorg-server xproto inputproto)
++
++# Define a configure option for an alternate input module directory
++AC_ARG_WITH(xorg-module-dir,
++            AC_HELP_STRING([--with-xorg-module-dir=DIR],
++                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
++            [moduledir="$withval"],
++            [moduledir="$libdir/xorg/modules"])
++inputdir=${moduledir}/input
++AC_SUBST(inputdir)
++
++# Checks for libraries.
++AC_CHECK_LIB([m], [sin])
++AC_CHECK_LIB([mtdev], [mtdev_open])
++
++# Checks for header files.
++AC_CHECK_HEADERS([fcntl.h stdint.h])
++
++# Checks for typedefs, structures, and compiler characteristics.
++AC_C_INLINE
++
++# Checks for library functions.
++AC_CHECK_FUNCS([memset])
++
++DRIVER_NAME=mtrack
++AC_SUBST([DRIVER_NAME])
++
++AC_ARG_ENABLE(debug, "Debug gesture")
++AC_ARG_ENABLE(debug,
++              AS_HELP_STRING([--enable-debug],
++                             [Enable debugging (default: disabled)]),
++              [AC_DEFINE(DEBUG_GESTURE, 1, Enable gesture degbug)])
++
++AC_CONFIG_FILES([Makefile src/Makefile])
++AC_OUTPUT
+diff --git a/src/Makefile.am b/src/Makefile.am
+new file mode 100644
+index 0000000..7484917
+--- /dev/null
++++ src/Makefile.am
+@@ -0,0 +1,16 @@
++AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
++AM_CPPFLAGS=-I$(top_srcdir)/include/
++
++@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
++@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
++@DRIVER_NAME@_drv_ladir = @inputdir@
++
++@DRIVER_NAME@_drv_la_SOURCES = \
++	$(top_srcdir)/src/capabilities.c	\
++	$(top_srcdir)/src/gestures.c		\
++	$(top_srcdir)/src/hwstate.c		\
++	$(top_srcdir)/src/mconfig.c		\
++	$(top_srcdir)/src/mtouch.c		\
++	$(top_srcdir)/src/mtstate.c		\
++	$(top_srcdir)/src/trig.c		\
++	$(top_srcdir)/driver/mtrack.c

diff --git a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-export.patch b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-export.patch
new file mode 100644
index 0000000..35f2cd2
--- /dev/null
+++ b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.1.1-export.patch
@@ -0,0 +1,10 @@
+diff --git a/driver/mtrack.c b/driver/mtrack.c
+index 3b785a6..5d1f2a3 100644
+--- a/driver/mtrack.c
++++ b/driver/mtrack.c
+@@ -348,4 +348,4 @@ static pointer setup(pointer module, pointer options, int *errmaj, int *errmin)
+ 	return module;
+ }
+ 
+-XF86ModuleData mtrackModuleData = {&VERSION, &setup, NULL };
++_X_EXPORT XF86ModuleData mtrackModuleData = {&VERSION, &setup, NULL };

diff --git a/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.2.0-drop-mtrack-test.patch b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.2.0-drop-mtrack-test.patch
new file mode 100644
index 0000000..5ee5e55
--- /dev/null
+++ b/x11-drivers/xf86-input-mtrack/files/xf86-input-mtrack-0.2.0-drop-mtrack-test.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index b22df2f..ed4c53c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -14,7 +14,7 @@ SOURCES_COMMON = \
+ 	$(srcdir)/driver/mprops.c
+ @DRIVER_NAME@_drv_ladir = @inputdir@
+ 
+-noinst_PROGRAMS = mtrack-test
++noinst_PROGRAMS =
+ mtrack_test_SOURCES = $(SOURCES_COMMON) \
+ 	$(srcdir)/tools/mtrack-test.c
+ mtrack_test_CFLAGS = $(AM_CFLAGS)

diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.1.1-r1.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.1.1-r1.ebuild
new file mode 100644
index 0000000..ef736f9
--- /dev/null
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.1.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.1.1-r1.ebuild,v 1.1 2011/05/21 07:13:35 naota Exp $
+
+EAPI="4-slot-abi"
+
+XORG_EAUTORECONF=yes
+
+inherit xorg-2
+
+DESCRIPTION="Xorg Driver for Multitouch Trackpads"
+HOMEPAGE="https://github.com/BlueDragonX/xf86-input-mtrack"
+SRC_URI="http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz"
+IUSE="debug"
+
+S="${WORKDIR}/BlueDragonX-xf86-input-mtrack-21f273e"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-libs/mtdev-1.0"
+DEPEND="${DEPEND}
+	>=sys-libs/mtdev-1.0"
+
+DOCS=( "README" )
+
+PATCHES=( "${FILESDIR}"/${P}-autoconf.patch
+	"${FILESDIR}"/${P}-export.patch )
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+
+	elog
+	elog "To enable multitouch support add the following lines"
+	elog "to your xorg.conf:"
+	elog ""
+	elog "Section \"InputClass\""
+	elog "  MatchIsTouchpad \"true\""
+	elog "  Identifier      \"Touchpads\""
+	elog "  Driver          \"mtrack\""
+	elog "EndSection"
+	elog
+}

diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild
new file mode 100644
index 0000000..8611144
--- /dev/null
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.2.0.ebuild,v 1.4 2012/06/24 19:01:47 ago Exp $
+
+EAPI="4-slot-abi"
+
+XORG_EAUTORECONF=yes
+
+inherit xorg-2
+
+DESCRIPTION="Xorg Driver for Multitouch Trackpads"
+HOMEPAGE="https://github.com/BlueDragonX/xf86-input-mtrack"
+SRC_URI="http://github.com/BlueDragonX/xf86-input-mtrack/tarball/v${PV/_/-} -> ${P}.tar.gz"
+IUSE="debug"
+
+inherit autotools
+
+S="${WORKDIR}/BlueDragonX-xf86-input-mtrack-4d517e7"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="${RDEPEND}
+	>=sys-libs/mtdev-1.0"
+DEPEND="${DEPEND}
+	>=sys-libs/mtdev-1.0"
+
+DOCS=( "README.md" )
+PATCHES=( "${FILESDIR}"/${P}-drop-mtrack-test.patch )
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+
+	elog
+	elog "To enable multitouch support add the following lines"
+	elog "to your xorg.conf:"
+	elog ""
+	elog "Section \"InputClass\""
+	elog "  MatchIsTouchpad \"true\""
+	elog "  Identifier      \"Touchpads\""
+	elog "  Driver          \"mtrack\""
+	elog "EndSection"
+	elog
+}

diff --git a/x11-drivers/xf86-input-mutouch/Manifest b/x11-drivers/xf86-input-mutouch/Manifest
new file mode 100644
index 0000000..cc95b5e
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-input-mutouch-1.2.1.tar.bz2 246240 RMD160 d4488b58d7826d9b31cd73dbf9c7113408383645 SHA1 c5883c2c5cc80186f711751e8847c9c07f2e4448 SHA256 53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b
+DIST xf86-input-mutouch-1.3.0.tar.bz2 268865 RMD160 7b0d71c0b8a8d026291e4c5e214af376e1fc932d SHA1 55702932f9ecef29bf9b096b9fdc45aa45614db5 SHA256 e28907ec71f010353550e897c7a1f161b59969c6ad84379fb5285e032448a43c
+EBUILD xf86-input-mutouch-1.2.1.ebuild 568 RMD160 d1a1fd9002fbe7079b407563236d82bddd93c225 SHA1 c11d20ddbe940b59d8c553fe3521993e93b5d0b2 SHA256 4e484f257986c2cfd74205b66b466cbc728060a168bee37f6102e38d220e25ea
+EBUILD xf86-input-mutouch-1.3.0.ebuild 442 RMD160 a7357d8058bfc8d8c465ef12bdc2917afb93ad67 SHA1 3186884f4a7e1f7277b3286bc528a8547586add8 SHA256 d0151ea8bf10a0f736024a1ba8498ad05a6eb20db2844fc98d7922be07290ebe
+MISC ChangeLog 6841 RMD160 172a2f1a421bd2730e22f2e39554d0e91fa07137 SHA1 36fc825df81bf612f58d424aebcf3b1780f1f8a7 SHA256 c6e91487c9f11979c2dc7a1343627b8c7f0fc2c177c8052bd5a6292f3ae599c1
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.2.1.ebuild b/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.2.1.ebuild
new file mode 100644
index 0000000..895f9b6
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.2.1.ebuild,v 1.10 2009/12/15 19:27:26 ranger Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=4
+
+inherit x-modular
+
+DESCRIPTION="Microtouch input driver"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.3.0.ebuild b/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.3.0.ebuild
new file mode 100644
index 0000000..eca758f
--- /dev/null
+++ b/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.3.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-mutouch/xf86-input-mutouch-1.3.0.ebuild,v 1.8 2012/05/16 00:28:42 aballier Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Microtouch input driver"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-penmount/Manifest b/x11-drivers/xf86-input-penmount/Manifest
new file mode 100644
index 0000000..864ccec
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-input-penmount-1.4.1.tar.bz2 255951 RMD160 447f0e064e60531dbe9e30785566ea26a842d3ee SHA1 a6923fe92ffbc698813063a5426b4ba2edfe465f SHA256 6f281a7bce9db34772bcf762eb0ed57b8121a204a6f15d5405fe870a0af57182
+DIST xf86-input-penmount-1.5.0.tar.bz2 276864 RMD160 79aac9452b68002d7e65df31eecc8845e71d3fe2 SHA1 39ed2dd2b22f8bf9366b187e4d7801a24c24cb31 SHA256 f45a85911a59647ba24f84c15f49d31d5f62a9bb86ca56881bf3ecbc21113ce7
+EBUILD xf86-input-penmount-1.4.1.ebuild 512 RMD160 d3c389c403b1169b3e0bc5760f5ff38321e59162 SHA1 20985f9d22f145aa75ce76ac0c103708edcf0501 SHA256 351ab204b4ddea66269187d0e13d6d293d4d9f3ed708dfddf5a30be864b3ffb3
+EBUILD xf86-input-penmount-1.5.0.ebuild 442 RMD160 a7ee8201508b233f7187e50fcf60dbe563540aa7 SHA1 40c53a9c22a495cb5c2b15f0ef52aac31aac74ce SHA256 4bc66f4b5912e25245873ec3f210f849afa749e52fafb0a7402ada6655edf335
+MISC ChangeLog 9778 RMD160 3070828718594f445e91b573c8539bb8c18ca9d7 SHA1 d25bc04a1025c3f142ff05b233e407e595d0f0ba SHA256 ccc74445d647170b96031e55d4ea8832fb8583686d6436c23aab4d7177292a29
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.4.1.ebuild b/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.4.1.ebuild
new file mode 100644
index 0000000..14f0257
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.4.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.4.1.ebuild,v 1.8 2010/08/02 17:57:17 armin76 Exp $
+
+inherit x-modular
+
+DESCRIPTION="PenMount input driver"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-1.4.1
+	x11-proto/randrproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.5.0.ebuild b/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.5.0.ebuild
new file mode 100644
index 0000000..fa31838
--- /dev/null
+++ b/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.5.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-penmount/xf86-input-penmount-1.5.0.ebuild,v 1.8 2012/05/16 00:41:22 aballier Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="PenMount input driver"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-synaptics/Manifest b/x11-drivers/xf86-input-synaptics/Manifest
new file mode 100644
index 0000000..9fccdb3
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/Manifest
@@ -0,0 +1,10 @@
+DIST xf86-input-synaptics-1.4.0.tar.bz2 395776 RMD160 e2fc6bc6de627e507dc0ff923b433862e4d36659 SHA1 96541b063482568e177f883a9fcfbe9a22c25569 SHA256 5874d979f028636dbddf14fffb84b496b006e63d5ea8dfa120820e58642812c2
+DIST xf86-input-synaptics-1.5.2.tar.bz2 403195 RMD160 1bb9392ce63560fa511f576569afd9c272d57316 SHA1 ce93cfa218c2c7bce7881ac2dd2160e583eb4c4f SHA256 ac6f6efad8ddf85fa6c5d68cac0c452bcea91aa53d5ee10b6205a353dfffaa92
+DIST xf86-input-synaptics-1.6.1.tar.bz2 437578 RMD160 ac37c24edc28a707e95cf40ec9c274f100028b8d SHA1 963276a5dd240e84efff28d516f8d23cfeedaa13 SHA256 1ab1459ea340f371c40be7d6a780e43bdaa2d9799c1de21145e3b5808d0eab3c
+DIST xf86-input-synaptics-1.6.2.tar.bz2 439313 RMD160 80931ce3e664d802bc36028d3631418d94625380 SHA1 6e59871c0cb683a1fa84731db73a662727a76976 SHA256 c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920
+EBUILD xf86-input-synaptics-1.4.0.ebuild 983 RMD160 ee8f5c500e7b908be90ffb8de42dab1e838833dc SHA1 77120088f33725415832249e0206f85b40a7fd5d SHA256 3a27659e638d67499e2603ff98b3e078e474b524f9806128f8e8d57d69c2ba29
+EBUILD xf86-input-synaptics-1.5.2.ebuild 962 RMD160 fa6e419c192c1349ffb5c6b0ed621cff33a2d95e SHA1 0e66bbbf9b1d3d16f2f4643b89b3b5208dca94ae SHA256 1038336ae69210405bd6fd85e8d87f911347dc0510a90edc3b3089975c9cafa9
+EBUILD xf86-input-synaptics-1.6.1.ebuild 1018 RMD160 a68b14baa0dbaf40823e08bb7302924cf7f5e80e SHA1 8355f34f3b238c1b8de30c77e27ffd3cca1c2dc5 SHA256 fcc5539bf692d22909bef7cefb4ee12c393ebb4089ad93521aec410471bb4891
+EBUILD xf86-input-synaptics-1.6.2.ebuild 1010 RMD160 7237453b036624f80d1b1afc401689a1003f2117 SHA1 fd1700c5723ad9a44eb4ccc52736d958ef33bcd5 SHA256 54540ac83fa057437cb5d20dbd500b0a8df7ac72b70b48185addbd57b0c3c188
+MISC ChangeLog 15952 RMD160 53840391ba4f5657a4c43f469909f89263e649ae SHA1 825b432604db0c6dc39d01691d7af882e6038783 SHA256 94402b22c6189a998953b8cc84756f9c04da2ef329045a973749e766a5870425
+MISC metadata.xml 397 RMD160 c01cf603d8ef6fc1fd03c04008ea2c62cbfab2d3 SHA1 a008e54ae2bf5800719e4d2a67ceae6b913a7f52 SHA256 fece0557310dc7deb0f0dc3a7a13b9a33b1b9ad18895eedc493fc1a488573bd4

diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0.ebuild
new file mode 100644
index 0000000..7bae74f
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.4.0.ebuild,v 1.6 2012/03/29 14:44:54 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	<x11-base/xorg-server-1.11.99
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libXtst-1.1.0"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	>=x11-proto/recordproto-1.14"
+
+DOCS=( "README" )
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.5.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.5.2.ebuild
new file mode 100644
index 0000000..21a7276
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.5.2.ebuild,v 1.1 2012/03/29 14:44:54 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=x11-base/xorg-server-1.8
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libXtst-1.1.0"
+DEPEND="${RDEPEND}
+	>=x11-proto/recordproto-1.14"
+
+DOCS=( "README" )
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.1.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.1.ebuild
new file mode 100644
index 0000000..77456cb
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.1.ebuild,v 1.3 2012/06/09 09:10:34 scarabeus Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/mtdev
+	>=x11-base/xorg-server-1.8
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libXtst-1.1.0"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.37
+	>=x11-proto/recordproto-1.14"
+
+DOCS=( "README" )
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
new file mode 100644
index 0000000..377a596
--- /dev/null
+++ b/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-synaptics/xf86-input-synaptics-1.6.2.ebuild,v 1.3 2012/06/24 19:02:12 ago Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Synaptics touchpads"
+HOMEPAGE="http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/"
+
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND="sys-libs/mtdev
+	>=x11-base/xorg-server-1.8
+	>=x11-libs/libXi-1.2
+	>=x11-libs/libXtst-1.1.0"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.37
+	>=x11-proto/recordproto-1.14"
+
+DOCS=( "README" )
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	# Just a friendly warning
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "This driver requires event interface support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>     Event interface"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-input-tslib/Manifest b/x11-drivers/xf86-input-tslib/Manifest
new file mode 100644
index 0000000..5098ae4
--- /dev/null
+++ b/x11-drivers/xf86-input-tslib/Manifest
@@ -0,0 +1,6 @@
+AUX fix-overlapped-variable.patch 485 RMD160 e4dcdd590b13d530131c0a52b6ae296777ae7f6f SHA1 340647621ffe72a8dc148dfc629c9556c7ab6a16 SHA256 d149611a62e9d6de547403bfcf8770fe1c8e87dd39d3ba22f42805dadcfd1978
+AUX xf86-input-tslib-port-ABI-12-r48.patch 5306 RMD160 06ebea44639c3db07fc2c685d6ed56fc07a91086 SHA1 3fb937ab06c55f83ec853c1e69c9578b91f7738f SHA256 d942843503246c9d05fbadf4abe98d37a34d02757e193a292c91407a326eabee
+DIST xf86-input-tslib_0.0.6-3.tar.gz 307751 RMD160 dbd81e0d6168ea6694756bebf6dbe5d972d71a0c SHA1 708c91cfc16f7f04d2d639addb424aae686037cd SHA256 546083a3d70b0da4403fb2add28036ed48f6a91adb802044ac0e4f3bcbc429f5
+EBUILD xf86-input-tslib-0.0.6-r2.ebuild 878 RMD160 787545270b3df57ea31183fd7d1d905b5d04e971 SHA1 f8c5fa99f9cb55f820f7c6a46b430b2101d85d9b SHA256 e03f86d3b3dd84a80cf454befdfae7ff3f6327422a51da1cde2c1460ea9e632d
+MISC ChangeLog 6022 RMD160 6779653a7c23cb18f90f76ea032cba2f02e7ab00 SHA1 f7fc8753dd49ec0f6d58a988833ff01baf45e64c SHA256 d453b0ca8411cde723e112d35e52d09d7bd72ff8e1a04e8b1d3aba8d29089701
+MISC metadata.xml 178 RMD160 2e88c45a7b3bea01b0e8a01881ad034329aa5b09 SHA1 9301b7968e89c6ca0d3b4c12425d461f43d31be7 SHA256 bd925eabbeacb7df7ee2fc7adc02d6000d232fe1c31c588d0d9881fbd9707cbe

diff --git a/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch b/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch
new file mode 100644
index 0000000..7a4363e
--- /dev/null
+++ b/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch
@@ -0,0 +1,20 @@
+--- src/tslib.c.orig	2010-05-19 19:01:01.000000000 +0200
++++ src/tslib.c	2010-05-19 19:02:00.000000000 +0200
+@@ -543,7 +543,7 @@
+ 	return (pInfo);
+ }
+ 
+-_X_EXPORT InputDriverRec TSLIB = {
++_X_EXPORT InputDriverRec TSLIB_DRIVER = {
+ 	1,			/* driver version */
+ 	"tslib",		/* driver name */
+ 	NULL,			/* identify */
+@@ -580,7 +580,7 @@
+ {
+ 	static Bool Initialised = FALSE;
+ 
+-	xf86AddInputDriver(&TSLIB, module, 0);
++	xf86AddInputDriver(&TSLIB_DRIVER, module, 0);
+ 
+ 	return module;
+ }

diff --git a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch
new file mode 100644
index 0000000..a4288fd
--- /dev/null
+++ b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch
@@ -0,0 +1,191 @@
+Index: xf86-input-tslib-trunk/src/tslib.c
+===================================================================
+--- xf86-input-tslib-trunk/src/tslib.c	(revision 48)
++++ xf86-input-tslib-trunk/src/tslib.c	(working copy)
+@@ -69,6 +69,13 @@
+ #define DEFAULT_HEIGHT		240
+ #define DEFAULT_WIDTH		320
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
++#else
++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
++#endif
++
++
+ enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
+ 
+ enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
+@@ -106,7 +113,7 @@
+ }
+ 
+ static Bool
+-ConvertProc( LocalDevicePtr local,
++ConvertProc( InputInfoPtr local,
+ 			 int first,
+ 			 int num,
+ 			 int v0,
+@@ -135,7 +142,7 @@
+     return t;
+ }
+ 
+-static void ReadInput (LocalDevicePtr local)
++static void ReadInput (InputInfoPtr local)
+ {
+ 	struct ts_priv *priv = (struct ts_priv *) (local->private);
+ 	struct ts_sample samp;
+@@ -382,7 +389,11 @@
+ 					       axiswidth - 1,	/* max val */
+ 					       axiswidth,	/* resolution */
+ 					       0,		/* min_res */
+-					       axiswidth);	/* max_res */
++					       axiswidth	/* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute
++#endif
++					       );
+ 
+ 		InitValuatorAxisStruct(device, 1,
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+@@ -392,7 +403,11 @@
+ 					       axisheight - 1,	/* max val */
+ 					       axisheight,	/* resolution */
+ 					       0,		/* min_res */
+-					       axisheight);	/* max_res */
++					       axisheight	/* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute
++#endif
++					       );
+ 
+ 		if (InitProximityClassDeviceStruct (device) == FALSE) {
+ 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
+@@ -434,7 +449,7 @@
+ 	ErrorF("%s\n", __FUNCTION__);
+ 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
+ 	ts_close(priv->ts);
+-	xfree(pInfo->private);
++	free(pInfo->private);
+ 	pInfo->private = NULL;
+ 	xf86DeleteInput(pInfo, 0);
+ }
+@@ -444,47 +459,57 @@
+  *
+  * called when the module subsection is found in XF86Config
+  */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++static int 
++xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
++#else
+ static InputInfoPtr
+ xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
++#endif
+ {
+ 	struct ts_priv *priv;
+ 	char *s;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	InputInfoPtr pInfo;
++#endif
+ 
+-	priv = xcalloc (1, sizeof (struct ts_priv));
++	priv = calloc (1, sizeof (struct ts_priv));
+         if (!priv)
+-                return NULL;
++                return BadValue;
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	if (!(pInfo = xf86AllocateInput(drv, 0))) {
+-		xfree(priv);
+-		return NULL;
++		free(priv);
++		return BadValue;
+ 	}
+ 
+ 	/* Initialise the InputInfoRec. */
+ 	pInfo->name = dev->identifier;
+-	pInfo->type_name = XI_TOUCHSCREEN;
+ 	pInfo->flags =
+ 	    XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
+ 	    XI86_SEND_DRAG_EVENTS;
+-	pInfo->device_control = xf86TslibControlProc;
+-	pInfo->read_input = ReadInput;
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
+ 	pInfo->motion_history_proc = xf86GetMotionEvents;
+ 	pInfo->history_size = 0;
+ #endif
+-	pInfo->control_proc = NULL;
++	pInfo->conf_idev = dev;
+ 	pInfo->close_proc = NULL;
+-	pInfo->switch_mode = NULL;
+ 	pInfo->conversion_proc = ConvertProc;
+ 	pInfo->reverse_conversion_proc = NULL;
+-	pInfo->dev = NULL;
+ 	pInfo->private_flags = 0;
+ 	pInfo->always_core_feedback = 0;
+-	pInfo->conf_idev = dev;
++#endif
++
++	pInfo->type_name = XI_TOUCHSCREEN;
++	pInfo->control_proc = NULL;
++	pInfo->read_input = ReadInput;
++	pInfo->device_control = xf86TslibControlProc;
++	pInfo->switch_mode = NULL;
+ 	pInfo->private = priv;
++	pInfo->dev = NULL;
+ 
+ 	/* Collect the options, and process the common options. */
+-	xf86CollectInputOptions(pInfo, NULL, NULL);
++	COLLECT_INPUT_OPTIONS(pInfo, NULL);
+ 	xf86ProcessCommonOptions(pInfo, pInfo->options);
+ 
+ 	priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
+@@ -510,23 +535,31 @@
+ 		priv->rotate = TSLIB_ROTATE_NONE;
+ 	}
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+  	s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
++#else
++	s = xf86CheckStrOption(pInfo->options, "path", NULL);
++#endif
+   	if (!s)
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 		s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
++#else
++		s = xf86CheckStrOption(pInfo->options, "Device", NULL);
++#endif
+  
+ 	priv->ts = ts_open(s, 1);
+-	xfree(s);
++	free(s);
+ 
+ 	if (!priv->ts) {
+ 		ErrorF("ts_open failed (device=%s)\n",s);
+ 		xf86DeleteInput(pInfo, 0);
+-		return NULL;
++		return BadValue;
+ 	}
+ 
+ 	if (ts_config(priv->ts)) {
+ 		ErrorF("ts_config failed\n");
+ 		xf86DeleteInput(pInfo, 0);
+-		return NULL;
++		return BadValue;
+ 	}
+ 
+ 	pInfo->fd = ts_fd(priv->ts);
+@@ -536,11 +569,13 @@
+ 		priv->state = BUTTON_EMULATION_OFF;
+ 	}
+ 
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+ 	/* Mark the device configured */
+ 	pInfo->flags |= XI86_CONFIGURED;
++#endif
+ 
+ 	/* Return the configured device */
+-	return (pInfo);
++	return Success;
+ }
+ 
+ _X_EXPORT InputDriverRec TSLIB = {

diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
new file mode 100644
index 0000000..146657d
--- /dev/null
+++ b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild,v 1.12 2012/03/18 15:05:54 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+PATCHLEVEL=3
+DEBSOURCES="${PN}_${PV}-${PATCHLEVEL}.tar.gz"
+
+DESCRIPTION="xorg input driver for use of tslib based touchscreen devices"
+HOMEPAGE="http://www.pengutronix.de/software/xf86-input-tslib/index_en.html"
+SRC_URI="ftp://cdn.debian.net/debian/pool/main/x/${PN}/${DEBSOURCES}"
+
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/tslib"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+S=${WORKDIR}/${PN}-trunk
+
+DOCS=( COPYING ChangeLog )
+
+PATCHES=(
+	"${FILESDIR}"/fix-overlapped-variable.patch
+	"${FILESDIR}"/${PN}-port-ABI-12-r48.patch
+)

diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
new file mode 100644
index 0000000..2542fb3
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -0,0 +1,8 @@
+DIST xf86-input-vmmouse-12.7.0.tar.bz2 281998 RMD160 99cd323f663800f71acf0c504c2ba7bb2cd369ed SHA1 6618f84a037c8f4817e1a2822d6a5a795814e544 SHA256 00e5d527a0d97e6b2a6e8c519e1339427e66fa0a43af026858655c7c62bd9e35
+DIST xf86-input-vmmouse-12.8.0.tar.bz2 300792 RMD160 426d4b011c57210d5e744a230e158c6dc5159749 SHA1 ecca90d5e992f9358f7932e0c46e92ebe715f9de SHA256 a8a6ec0b567c48c130ccb830e15dfc2b201831841de0c2cc56bd87256d2d869a
+DIST xf86-input-vmmouse-12.9.0.tar.bz2 308053 RMD160 116ed6b242ba54bcf056fc8ef754b1e7d6737f92 SHA1 83500beddba2da390389705d482131872fe9be8b SHA256 fbcf00f6bfee38bc65e0f0b812a4d076f7e203e81ed908e57de4026792b299bf
+EBUILD xf86-input-vmmouse-12.7.0.ebuild 672 RMD160 c7ea8718d6ebcac9a6c139e737b0e78c96a39a2f SHA1 4bd9fe27e3837142e398d5fa8a4452bbdef081e4 SHA256 b23a1fe300fb01a05743854494998fbae6c4145817091f29a26f373c8fc0dba0
+EBUILD xf86-input-vmmouse-12.8.0.ebuild 641 RMD160 55a87d70d2fa61d2e18270509488c5482f53c049 SHA1 eda669932f56210c74f2d55ad8cbdc6a8584d59f SHA256 fc5c61b65510111c1e97dc4a78f6f647223bb685c3e341f0de5bf4378852f861
+EBUILD xf86-input-vmmouse-12.9.0.ebuild 634 RMD160 6a0bbbec2553f96fd0478ad0e2d28d38a7b277ad SHA1 ba70011809b80d13354e972926e1475b4e31eec8 SHA256 318d58048e50d4770c4ed843f0657c7661f2ea74ad68a4c88837b545e622058f
+MISC ChangeLog 8167 RMD160 a1d42ad8fdc1e308061302c100ab8736c61739d8 SHA1 d30912d296b0ab06d557cbf7cdb8537ad730e1ec SHA256 3962b33cdf6544dfd72c45c0f476403441eb8eea9d08cec29cdfe5fc918a59a6
+MISC metadata.xml 254 RMD160 c918c791107bb6bade5533be97fda2a5357ade13 SHA1 c0bf2ca0f6107fdce02502942d7050d84ad30fb2 SHA256 32d68d1ad2e14d3f3af865dce8b2e42fec8722f17b1b35beeb5ecbd9b8e1a253

diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.7.0.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.7.0.ebuild
new file mode 100644
index 0000000..425c37f
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.7.0.ebuild,v 1.6 2011/03/30 21:24:10 ssuominen Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="VMWare mouse input driver"
+IUSE=""
+KEYWORDS="amd64 x86 ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=x11-proto/inputproto-1.4.1
+	x11-proto/randrproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="
+		--with-hal-bin-dir=/punt
+		--with-hal-callouts-dir=/punt
+		--with-hal-fdi-dir=/punt
+		"
+
+	xorg-2_pkg_setup
+}
+
+src_install() {
+	xorg-2_src_install
+	rm -rf "${ED}"/punt
+}

diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.8.0.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.8.0.ebuild
new file mode 100644
index 0000000..58c34fe
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.8.0.ebuild,v 1.2 2012/05/16 00:41:44 aballier Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="VMWare mouse input driver"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-hal-bin-dir=/punt
+		--with-hal-callouts-dir=/punt
+		--with-hal-fdi-dir=/punt
+	)
+
+	xorg-2_pkg_setup
+}
+
+src_install() {
+	xorg-2_src_install
+	rm -rf "${ED}"/punt
+}

diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild
new file mode 100644
index 0000000..31e35c4
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-12.9.0.ebuild,v 1.3 2012/06/24 19:02:37 ago Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="VMWare mouse input driver"
+IUSE=""
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		--with-hal-bin-dir=/punt
+		--with-hal-callouts-dir=/punt
+		--with-hal-fdi-dir=/punt
+	)
+
+	xorg-2_pkg_setup
+}
+
+src_install() {
+	xorg-2_src_install
+	rm -rf "${ED}"/punt
+}

diff --git a/x11-drivers/xf86-input-void/Manifest b/x11-drivers/xf86-input-void/Manifest
new file mode 100644
index 0000000..d9ee28e
--- /dev/null
+++ b/x11-drivers/xf86-input-void/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-input-void-1.3.1.tar.bz2 242189 RMD160 e1088ee141eb7142db5a7e8fa1db8a0fa3c79df4 SHA1 f0009bd77d205c5e5a9791d8f498780b44e931ae SHA256 aba69784ac83f5951af3e164312adb4b8b1c91a8f79ab35dc5165c534e14c674
+DIST xf86-input-void-1.4.0.tar.bz2 273454 RMD160 96aeff80628ad7b30bdf444c58343bff9aa8dd64 SHA1 49b462d3acb16337eaf78202d4074f19d5e20b29 SHA256 2ab95865252c64cc88050fa0089a74e063c357b71907bf9be7886047c4987505
+EBUILD xf86-input-void-1.3.1.ebuild 491 RMD160 2568c63ddf691df5a0958c45738ee478d47b396e SHA1 1229465ecd338edda969594faad831b5c5854dbf SHA256 6c700e484fbaf5dc0dd028f3ba67220fc1d71ae7a8383a40c7e1eeee65784f71
+EBUILD xf86-input-void-1.4.0.ebuild 461 RMD160 a93de89541ffc867e9cf5db815c5977d12697eae SHA1 0d0318cff57d9333c82ac33aff385404d81a7103 SHA256 b675f1c9e80753ae191a63e0839741301c1af37969cf7ab272aed2a22f8e1880
+MISC ChangeLog 8907 RMD160 16f000a023b7e2f8594abae1ada2858cad978715 SHA1 caa1b6b293149c13bfef3ba33394040cf93bdc87 SHA256 59f961dbd55106bf8102d627c0129cf7aa6be4bea3c58445a55a30ed01ddad0e
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.3.1.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.3.1.ebuild
new file mode 100644
index 0000000..4b6ab3d
--- /dev/null
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.3.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-void/xf86-input-void-1.3.1.ebuild,v 1.8 2011/02/14 23:56:23 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="null input driver"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/randrproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild b/x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild
new file mode 100644
index 0000000..81a7f4d
--- /dev/null
+++ b/x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-void/xf86-input-void-1.4.0.ebuild,v 1.9 2012/05/16 00:42:04 aballier Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="null input driver"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.9.99.1"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
new file mode 100644
index 0000000..a205de5
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -0,0 +1,12 @@
+DIST xf86-input-wacom-0.11.0.tar.bz2 490183 RMD160 7c6768eb058b5bc11bae540985c088c95d2a9247 SHA1 c76be36900c9f634fa63f6a2b340fc6b79d0a2be SHA256 112235476c4ace61da5fddd63ca9d33e083fd75b84a81b4490102aa023f39e61
+DIST xf86-input-wacom-0.11.1.tar.bz2 505180 RMD160 ec282ff0d203ef70008ba43d8485bbca25e24282 SHA1 e8b0ec91a95a13a897d34c6ebe2af564e1ce3cb2 SHA256 9d32f94610f8faae3214227a8e8f050cd3b469b3fe9d60ef9272a884dcccb6ca
+DIST xf86-input-wacom-0.13.0.tar.bz2 508958 RMD160 23c3600f19fd8c3b51d14e7ad7927f5ee14883df SHA1 67d4b78728ea1474b7d312853cdcd613ff4c7c49 SHA256 3895b87d51c69224b36f7859911fc2b6a6e0017f1c6c620417e35e7083a6c7f4
+DIST xf86-input-wacom-0.14.0.tar.bz2 515278 RMD160 362cc49f5c805452ad94bc899c06d4fdaf98b2ff SHA1 3cc91315355b721b1959a8e9d7dc06587f3395af SHA256 929817ec7979d87432226245c687a1fdd211dcd3057c9d10dce72a933d80a69e
+DIST xf86-input-wacom-0.15.0.tar.bz2 528528 RMD160 132054aff24ae6fb8abef0189e7c23c7bc53e4c3 SHA1 6e8e4fa2ccc2448cae97119c6f2842fe283f9b29 SHA256 2e9b64c30fb223c46407bd0e105a54a1e83f378eb33ac68bd8a73fdbface000f
+EBUILD xf86-input-wacom-0.11.0.ebuild 1412 RMD160 a6ddb1f6624f75dc8d0aa0ce7cb8590e6510c5d3 SHA1 3d245d65181238e61c200e88868c36027059aa2a SHA256 761236211eaedf3eb335d1e572424f5b78803c91a2fba9c9144c12236f36b6d5
+EBUILD xf86-input-wacom-0.11.1.ebuild 1442 RMD160 1dd8d0ae9c7e5189a439b72eb8eaea2aa514d737 SHA1 2c3ff158deb796f9183c6442de966077099d9608 SHA256 5d21aeec711b2cea4af41e62f7859ad9eb3009ff7440a8e07a360d6653604aa4
+EBUILD xf86-input-wacom-0.13.0.ebuild 1421 RMD160 3daee3d6954c80ee7571aebbd14f7dc9df725ea5 SHA1 b1286854a28cba76a53bc3df58da544f7574e72e SHA256 9655309d3ca948e72d043ae2cb8f599360be199de14558d692cd78bb55dc6caa
+EBUILD xf86-input-wacom-0.14.0.ebuild 1416 RMD160 12c2ca3ef2d161b353a07f66f8189f276ec67ccc SHA1 88ad421d4ab38c3a91152f591e74178f4486a60e SHA256 37412de99f88ce149c91a5cd997eb5fcb54a69a0cb43f3dc2ecbe6d5a0b6cfe1
+EBUILD xf86-input-wacom-0.15.0.ebuild 1421 RMD160 691b9ddb59f68d6753e14409d0c390158119c93d SHA1 3d803da337be11cb07b0bdcfb2f280ad48111614 SHA256 a2d303ba8302d035223a442a496474fcc069e9aa65840c71a7ddfc0118ead4ed
+MISC ChangeLog 8449 RMD160 602a04b034578fb911e3b11dec3c4f710c416d9e SHA1 8de8444227a7a63ae373a6759e56f5807b7e5917 SHA256 72fd5c6219a8d6bf31f397b7c089aea81ae9deec463ff2dd34d5832c6ce59e26
+MISC metadata.xml 365 RMD160 808ca8e60d1314d487519f7cf105148f52f96a36 SHA1 fe0154d304388ec2ff8cb6d58a3d30c10e6a44b8 SHA256 c2c9afd84e3b5dea0662cd9cb186a1efcc9ae1d96fc569bb7504701dd2925714

diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.0.ebuild
new file mode 100644
index 0000000..87103f3
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.0.ebuild,v 1.7 2011/07/29 10:50:32 xarthisius Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="debug"
+
+RDEPEND="!x11-drivers/linuxwacom
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+	xorg-2_pkg_setup
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${D}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present TABLET_USB_WACOM \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>   Event interface"
+		ewarn "      [*]   Tablets  --->"
+		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild
new file mode 100644
index 0000000..56fbadf
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild,v 1.4 2012/03/03 16:28:53 ranger Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="debug"
+
+RDEPEND="!x11-drivers/linuxwacom
+	>=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present TABLET_USB_WACOM \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>   Event interface"
+		ewarn "      [*]   Tablets  --->"
+		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.13.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.13.0.ebuild
new file mode 100644
index 0000000..2ad133a
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.13.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.13.0.ebuild,v 1.1 2012/02/11 16:33:16 ikelos Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present TABLET_USB_WACOM \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>   Event interface"
+		ewarn "      [*]   Tablets  --->"
+		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild
new file mode 100644
index 0000000..7adc220
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.14.0.ebuild,v 1.3 2012/06/24 19:03:03 ago Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="debug"
+
+RDEPEND=">=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present TABLET_USB_WACOM \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>   Event interface"
+		ewarn "      [*]   Tablets  --->"
+		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.15.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.15.0.ebuild
new file mode 100644
index 0000000..6c834f2
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.15.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.15.0.ebuild,v 1.1 2012/06/23 19:30:40 ikelos Exp $
+
+EAPI="4-slot-abi"
+
+inherit linux-info xorg-2
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+LICENSE="GPL-2"
+EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=x11-base/xorg-server-1.7
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+	)
+}
+
+src_install() {
+	xorg-2_src_install
+
+	rm -rf "${ED}"/usr/share/hal
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists \
+			|| ! linux_chkconfig_present TABLET_USB_WACOM \
+			|| ! linux_chkconfig_present INPUT_EVDEV; then
+		echo
+		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Input device support --->"
+		ewarn "      <*>   Event interface"
+		ewarn "      [*]   Tablets  --->"
+		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-apm/Manifest b/x11-drivers/xf86-video-apm/Manifest
new file mode 100644
index 0000000..88ac04f
--- /dev/null
+++ b/x11-drivers/xf86-video-apm/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-apm-1.2.3.tar.bz2 295470 RMD160 45a27d62a77a83fe8ff61d37ab31544116bec130 SHA1 1fa7180cf985a74132f8d5b39a0bf9df08713fac SHA256 4046ea18dbd76a9df5f68695025c2c411c20564af9198974506a041ebd4a30da
+DIST xf86-video-apm-1.2.4.tar.bz2 325979 RMD160 63f5b68278469ce9df4bfcdc1d7c2a50750ce7c4 SHA1 d792ba6e8c39e60e00e0790b4e08f551044b2f7c SHA256 ae65982961fe884728497db9b805123d486d2aade2ba8e7bba9a3ee9dccf4302
+EBUILD xf86-video-apm-1.2.3.ebuild 567 RMD160 ce2403a7a2db1a77e9e7df59527b6db67514a219 SHA1 983c421c5648c40eaffc5c5f6800dc0427903704 SHA256 a27a6faf777df3ddea78ef268399d05dc468aac9acb7b0da4c988ffe5919ee20
+EBUILD xf86-video-apm-1.2.4.ebuild 434 RMD160 69c6ab01245b0cfbf3a967d4a87debc637ee9cb2 SHA1 ebdda679f2b8068b1ca60f71a8c683b27c3eff94 SHA256 3484bef0389ccfb074ca86452eebd9f8933f5896290407c0fd66b3f2eabd1d59
+MISC ChangeLog 5927 RMD160 74264988127907240cef51deeef0577995339f89 SHA1 517f432fa366b7540864973202d71796ddb343cc SHA256 92fdf25c55d8a42d70d9844aefb296b2a1dbe6bc02b3c14da3e7c36536a251df
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.3.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.3.ebuild
new file mode 100644
index 0000000..86041ce
--- /dev/null
+++ b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.3.ebuild,v 1.4 2011/02/12 19:00:24 armin76 Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Alliance ProMotion video driver"
+
+KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86rushproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild
new file mode 100644
index 0000000..163b8de
--- /dev/null
+++ b/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-apm/xf86-video-apm-1.2.4.ebuild,v 1.4 2012/06/24 19:03:29 ago Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Alliance ProMotion video driver"
+
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-ark/Manifest b/x11-drivers/xf86-video-ark/Manifest
new file mode 100644
index 0000000..f53363d
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-ark-0.7.3.tar.bz2 238946 RMD160 264b097e82d57220ad5a61a818f4abdc80b8854b SHA1 56901ec6097a83433689f208268281f9c98c238b SHA256 39149a565c64ae013962022c45e561a0e92c5ab413688f3b5055cad694f28f98
+DIST xf86-video-ark-0.7.4.tar.bz2 273338 RMD160 ecca71ad78bb0bf71935dc300fc45cb8f94ea7e4 SHA1 d95cb9aa56e7db542b3ac8fed9cb519b11f77556 SHA256 bd4cdba48a974acaca289d20b8268a4d3084e2b2c9d1c83adb03ba1dcb609fa4
+EBUILD xf86-video-ark-0.7.3.ebuild 514 RMD160 56ecaa4473b9f06588eb1ada3dad252ec6f77bd4 SHA1 05df17805e584bfd68295311ee1de19db470ba87 SHA256 9371023b3029aba7c5ede81d30539f17cb83630babc623164167c057be166f1c
+EBUILD xf86-video-ark-0.7.4.ebuild 462 RMD160 d43b1ef1634f1d48b169c612d052c3b079c40283 SHA1 e330a7904e1c3ff5ee9c8a9bbdb236254be8611b SHA256 471ac04229ea921bac7e31c06483b1c8b0ad3bba4b72d6c6f349f01d137d3652
+MISC ChangeLog 6364 RMD160 9e9343e204be8cc985a1ef09d45f433629248d32 SHA1 01c9cea72e39988b88c8ba5e492caf8c73b133a8 SHA256 4402dced4a0877e199412eb1ef6b08d26eb61a71846b7de3f52253a33a20bf93
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.3.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.3.ebuild
new file mode 100644
index 0000000..aa77df5
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.3.ebuild,v 1.4 2011/02/12 19:01:52 armin76 Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for ark cards"
+KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild
new file mode 100644
index 0000000..cc7b5ed
--- /dev/null
+++ b/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ark/xf86-video-ark-0.7.4.ebuild,v 1.5 2012/06/24 19:03:56 ago Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for ark cards"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	>=x11-libs/libpciaccess-0.12.901"

diff --git a/x11-drivers/xf86-video-ast/Manifest b/x11-drivers/xf86-video-ast/Manifest
new file mode 100644
index 0000000..7337277
--- /dev/null
+++ b/x11-drivers/xf86-video-ast/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-ast-0.93.10.tar.bz2 316783 RMD160 0b265161cbb3def742ce1e4e77dbaeb84c1040b7 SHA1 40e8acd04ccf670b196be74a2c806d064f7b68db SHA256 c9d466fef391bdf960f79b82f1f776a1c1ab870e93475c3d1b3d028531fac4e0
+DIST xf86-video-ast-0.95.0.tar.bz2 330114 RMD160 dc4294ae571b02be7eaf172a642c2c275e52095b SHA1 c2380f134f37a66853bcf4128f1a552c3d0855b7 SHA256 eb5cbeceb887241534394d040856fee80cba6dd561f8dca921105c5b69fde973
+EBUILD xf86-video-ast-0.93.10.ebuild 378 RMD160 7256955650ec2676f3251ae91c511dee63724357 SHA1 ba7551a4f7b1ce0c0881c936390e64af06c6f11d SHA256 87d1a4a5bc9f388c0899ab8fccee360ee470263a7abd1a94723c89afd3b766c5
+EBUILD xf86-video-ast-0.95.0.ebuild 383 RMD160 9f18ca3bc355255ee79c950fabb797ebcad3ee02 SHA1 23cb4d24c3b829ad215d5ec431a1df8ba50ad890 SHA256 ee78c56ef93e3ad48943e48e7ec3d21b216265cab512ef2b5c2f0fe8aecf5a5d
+MISC ChangeLog 3438 RMD160 f9b6468598e44ddbd4acf99df73d272ec418bd52 SHA1 5b7b7683686c37348e3014b2eee67d252d8e67a9 SHA256 7ed4ddfbba13f28b83c919bdc4e029d84826d4ec0fe83d0ea30941516103a920
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-0.93.10.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-0.93.10.ebuild
new file mode 100644
index 0000000..398cac4
--- /dev/null
+++ b/x11-drivers/xf86-video-ast/xf86-video-ast-0.93.10.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/xf86-video-ast-0.93.10.ebuild,v 1.2 2012/04/29 13:00:29 scarabeus Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for ASpeedTech cards"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+LICENSE="MIT"
+IUSE=""

diff --git a/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild b/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild
new file mode 100644
index 0000000..0e408b9
--- /dev/null
+++ b/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ast/xf86-video-ast-0.95.0.ebuild,v 1.4 2012/06/24 19:04:21 ago Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for ASpeedTech cards"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
+LICENSE="MIT"
+IUSE=""

diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
new file mode 100644
index 0000000..aff01ca
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -0,0 +1,25 @@
+AUX xf86-video-ati-6.14.0-xorg-server-1.10.patch 1133 RMD160 489da229ad6494d9f21fe8f8e1c3d7884724bf97 SHA1 7cded8f5f48ee0c4af49602cafc8db46a56937b9 SHA256 609c43ad9e9860d4dabbafd14e9c4b96529375b256bf82c4276c20b5b8ab204b
+AUX xf86-video-ati-6.14.3-pcitag.patch 1450 RMD160 aa62bff417d36053da6767cc4041fcfb7cbd7a4e SHA1 8b53ebdd38ea080992812b27e3b54d88ccdbbd19 SHA256 05d7407da399a7cc0cfb98f5a8977384754075f2d03b17b3ef5c9d7aad297b1e
+AUX xf86-video-ati-6.14.3-xorg-server-1.12.patch 3637 RMD160 159b182b7139d9aeb5df5a6756fa4292c095d018 SHA1 3b42db2a94bee9935730866cc931a5005fd364d4 SHA256 9829b065815b85a805fc537e5e3cab6a4f0f523f5334493619b791c7622d8102
+AUX xf86-video-ati-6.14.4-exa-solid-accel-evergreen.patch 10993 RMD160 4107ba56c3788f48ccfc8fd24f6bf8790d2c36a2 SHA1 bfd5e44e12f58a95cfbd8f08cae60f76471ae9d7 SHA256 2bc497c453c5e87f63cde4f224446347c5d730575ebecccc0aa0feba18ce7fd4
+AUX xf86-video-ati-6.14.4-exa-solid-accel-r100.patch 6527 RMD160 5135149c19a4d5fda81285f7ea83ca94fe4dd30d SHA1 9e8ad550c15efa30946d9ed331a78212036f9862 SHA256 d1d991d7aaef21132ea892757611fbb660dfe64fb6b5ffb1bd33f8b6f2d98342
+AUX xf86-video-ati-6.14.4-exa-solid-accel-r200.patch 6548 RMD160 713861a1653ea4d1ffb1db3e89443613b9c3c906 SHA1 16fa780dc9f3e37dc5b9137a769b03cca72fc3c4 SHA256 0a49ca2a700e90721390eb77e62086aa0c68201ede9db2f9aea21ddc957eb444
+AUX xf86-video-ati-6.14.4-exa-solid-accel-r300.patch 20383 RMD160 36537328e2dd62831114bb045ad685fe7cfeff8f SHA1 6faf3a005e532892298d73f5f40edef4a847260f SHA256 1ad91f3d120f06beb9d0d905931aeb4086ff7d7342ebbdf681b2d9ffa66169f7
+DIST xf86-video-ati-6.13.2.tar.bz2 985673 RMD160 46f581fcd631c841b511bb7071a1aa2252fe9078 SHA1 f9d379a884a833829ab1942de4ad4f4766cdcd46 SHA256 d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
+DIST xf86-video-ati-6.14.0.tar.bz2 1054336 RMD160 0997c743680b9924166365ab51a69c79e6975d38 SHA1 132a6b1ed6e03f7365659cdcf520516746a8fc27 SHA256 9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b
+DIST xf86-video-ati-6.14.1.tar.bz2 1058696 RMD160 0caa260c0b3dccf3444241e84bb04cdf02db8426 SHA1 89b8a64a23fc307646a11cd2c2636a8125fada8f SHA256 e457285096e1e40f53ae5b58b948906c69add5160cc38ce510f0d15e82d91c75
+DIST xf86-video-ati-6.14.2.tar.bz2 1072263 RMD160 69e733c43bf030783bea049235f6723e818b763c SHA1 2733b3c126ad9e082ea18b7e7663d6d87fce4d49 SHA256 017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc
+DIST xf86-video-ati-6.14.3.tar.bz2 1113119 RMD160 fc39fd2a16c6de65ad9ae87b30fdad15134bc139 SHA1 db635e2e2858d5db90362f546ac0adad85474bad SHA256 844a2649eff6a3e92aff3e1837ea864f1561b4822b3e5d5ccb27b3b7fb8137b4
+DIST xf86-video-ati-6.14.4.tar.bz2 1108681 RMD160 6cd8076333b06d906ea91563144aff0a4453a831 SHA1 75ad000bc00599e1797134f2d20d3094cba6af92 SHA256 4ffe435ef8fbe0989f6576f04f789e147a2de7fdefc3644e39d5ef626c37ef85
+DIST xf86-video-ati-6.14.5.tar.bz2 1112274 RMD160 e3f890ea47f98fea03b65b2c8ec1c52463569da0 SHA1 a71990e832006e137f2825375c2e5829d5756068 SHA256 ef879d2845de50cec1aa98e37185271e1d535c0009efd6713ec88206b7197d53
+EBUILD xf86-video-ati-6.13.2.ebuild 761 RMD160 47ec49e9615b8e063dbc5b1dd44b3a9acb620a78 SHA1 a12ec1e65b09ae5aaecf48c4f2a7505a5eb90b2e SHA256 94f2fa9d736c4be35f7a092855838830b64443c20f11e0ab18c58567a7a22dc2
+EBUILD xf86-video-ati-6.14.0.ebuild 819 RMD160 cef707336652afb052e018347ab0bc9be8e7a688 SHA1 7b0b4e81d4d3f02e477fbc3aab634c7ae04017a7 SHA256 c2df919c39664b05b29c7dd3afd06d138c01db16ba0c894cc931b0b042978d91
+EBUILD xf86-video-ati-6.14.1.ebuild 562 RMD160 46f58ec0a7984fa9f4d3df22913b357297203c69 SHA1 ce09a7354217772cc17c994ceef0855525dedf78 SHA256 1c42aaf422eb3967d859c8613d201abdc3aa25dae24daf6b3d939275ac66ca30
+EBUILD xf86-video-ati-6.14.2.ebuild 564 RMD160 eb1c0f1d3876e2d7efe800e4dc7f547bede69638 SHA1 f4e26f5c956dddb9e143044a8aea9d8e375364d6 SHA256 4fed1fb1b60df929d9a354738619505fe244677e4d27d24f08a786182c76ce45
+EBUILD xf86-video-ati-6.14.3-r1.ebuild 701 RMD160 c332a65d6045225d51de5f01ec016262b9753880 SHA1 67a5e57ca6372fbdca9f7c1d7707f7963995249a SHA256 9c57c4f47c222ddda8c57887c4e05aaea83c88aaf821c5c14f8c0a3af6087096
+EBUILD xf86-video-ati-6.14.3.ebuild 650 RMD160 d55030b0f047a51b07657e2d5b7a9d17c94deb9b SHA1 ddf2709e70a89b48da760500fbc8d08bb0f83c6c SHA256 ee06464e46539bf09f56e6589d45773859f06688ffcdc951fac36ffc7b4f0cbc
+EBUILD xf86-video-ati-6.14.4-r1.ebuild 827 RMD160 faa074ea4683b767b4020d51fee5cfe7aeb20a85 SHA1 f307c2599858b645e94e0355e196cfb1434da6e9 SHA256 70a41b0d887b8297cc5b9c1441d3f3f8971a4b001b621f2ea07a906d802ed6d4
+EBUILD xf86-video-ati-6.14.4.ebuild 602 RMD160 f8f585b1966d76c7f0b328ce78a08ac413772a63 SHA1 f62d688cb25f958f64e8bd837e13b2e7ec46931a SHA256 538afa427459ba0ec092a9dd513873a920a2e23497e6881ab73eb7a37ffe5f5c
+EBUILD xf86-video-ati-6.14.5.ebuild 593 RMD160 7db36429b017c879beeef3a7ab8969b0932c888c SHA1 35cee14ce221a588b0231306985214860be7cbcf SHA256 f1dd6589da3506ef91959dc67ae0b6bac296d973ebdb2c8ec15f6edbe320f53e
+MISC ChangeLog 30617 RMD160 8a4fd3207e54760ab87bd83364673702c16f7531 SHA1 caa60432a4d15da38d78824cef7294a2827e0d3f SHA256 9b03f8670b2220ae75ef7eba696c202d34dfd2f54c471f65bc7c8b4cfebd7a4c
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.0-xorg-server-1.10.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.0-xorg-server-1.10.patch
new file mode 100644
index 0000000..5b47bc0
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.0-xorg-server-1.10.patch
@@ -0,0 +1,33 @@
+From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001
+From: Sedat Dilek <sedat.dilek@××××××××××.com>
+Date: Fri, 25 Feb 2011 20:48:14 +0000
+Subject: UMS: Fix build against xserver 1.10-rc3
+
+This issue was introduced due to last minute backout of RandR-1.4
+in xserver 1.10-rc3.
+
+Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard.
+See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>.
+
+Note:
+The ddx needs a rebuild as the X video driver ABI changed to version 10.0.
+
+Reported-by: Alex Deucher <alexdeucher@×××××.com>
+CC: Keith Packard <keithp@××××××.com>
+Signed-off-by: Sedat Dilek <sedat.dilek@×××××.com>
+---
+diff --git a/src/radeon_output.c b/src/radeon_output.c
+index 15cef06..ccde346 100644
+--- a/src/radeon_output.c
++++ b/src/radeon_output.c
+@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output)
+ 	xf86CrtcPtr crtc = output->crtc;
+ 
+ 	if (crtc->enabled) {
+-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
++#ifdef RANDR_14_INTERFACE
+ 	    xf86CrtcSetRec crtc_set_rec;
+ 
+ 	    crtc_set_rec.flags = (XF86CrtcSetMode |
+--
+cgit v0.8.3-6-g21f6

diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch
new file mode 100644
index 0000000..96b2b81
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch
@@ -0,0 +1,41 @@
+From 89452c08048c98fb5cc3dc551b3824be40d52cf2 Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@×××.com>
+Date: Tue, 08 Nov 2011 10:23:11 +0000
+Subject: UMS: Guard references to PCITAG / pciTag with XSERVER_LIBPCIACCESS (bug #42690)
+
+Should fix https://bugs.freedesktop.org/show_bug.cgi?id=42690 .
+
+Signed-off-by: Michel Dänzer <michel.daenzer@×××.com>
+---
+diff --git a/src/radeon.h b/src/radeon.h
+index da95f8b..34f6f53 100644
+--- a/src/radeon.h
++++ b/src/radeon.h
+@@ -792,7 +792,9 @@ struct radeon_accel_state {
+ typedef struct {
+     EntityInfoPtr     pEnt;
+     pciVideoPtr       PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+     PCITAG            PciTag;
++#endif
+     int               Chipset;
+     RADEONChipFamily  ChipFamily;
+     RADEONErrata      ChipErrata;
+diff --git a/src/radeon_driver.c b/src/radeon_driver.c
+index 293897a..a9abd66 100644
+--- a/src/radeon_driver.c
++++ b/src/radeon_driver.c
+@@ -3023,9 +3023,11 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+     }
+ 
+     info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+     info->PciTag  = pciTag(PCI_DEV_BUS(info->PciInfo),
+ 			   PCI_DEV_DEV(info->PciInfo),
+ 			   PCI_DEV_FUNC(info->PciInfo));
++#endif
+     info->MMIOAddr = PCI_REGION_BASE(info->PciInfo, 2, REGION_MEM) & ~0xffULL;
+     info->MMIOSize = PCI_REGION_SIZE(info->PciInfo, 2);
+ 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TOTO SAYS %016llx\n", 
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch
new file mode 100644
index 0000000..43fa945
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch
@@ -0,0 +1,118 @@
+From c66ae235700f5efe64eb168327551b8f1d153c9c Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@×××.com>
+Date: Mon, 13 Feb 2012 09:43:58 +0000
+Subject: Handle new xorg_list API.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=45937
+
+Signed-off-by: Michel Dänzer <michel.daenzer@×××.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 29f129a..0083325 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -234,10 +234,18 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ 	      [#include "xorg-server.h"])
+ 
+ AC_CHECK_HEADERS([list.h],
+-		 [], [],
++		 [have_list_h="yes"], [have_list_h="no"],
+ 		 [#include <X11/Xdefs.h>
+ 		  #include "xorg-server.h"])
+ 
++if test "x$have_list_h" = xyes; then
++    AC_CHECK_DECL(xorg_list_init,
++		  [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [],
++		  [#include <X11/Xdefs.h>
++		   #include "xorg-server.h"
++		   #include "list.h"])
++fi
++
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+ AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
+diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
+index 835575f..cf905a1 100644
+--- a/src/radeon_dri2.c
++++ b/src/radeon_dri2.c
+@@ -40,6 +40,13 @@
+ 
+ #if HAVE_LIST_H
+ #include "list.h"
++#if !HAVE_XORG_LIST
++#define xorg_list			list
++#define xorg_list_init			list_init
++#define xorg_list_add			list_add
++#define xorg_list_del			list_del
++#define xorg_list_for_each_entry	list_for_each_entry
++#endif
+ #endif
+ 
+ #ifdef RADEON_DRI2
+@@ -515,11 +522,11 @@ typedef struct _DRI2FrameEvent {
+ 
+     Bool valid;
+ 
+-    struct list link;
++    struct xorg_list link;
+ } DRI2FrameEventRec, *DRI2FrameEventPtr;
+ 
+ typedef struct _DRI2ClientEvents {
+-    struct list   reference_list;
++    struct xorg_list   reference_list;
+ } DRI2ClientEventsRec, *DRI2ClientEventsPtr;
+ 
+ #if HAS_DEVPRIVATEKEYREC
+@@ -538,7 +545,7 @@ DevPrivateKey DRI2ClientEventsPrivateKey = &DRI2ClientEventsPrivateKeyIndex;
+     dixLookupPrivate(&(pClient)->devPrivates, DRI2ClientEventsPrivateKey))
+ 
+ static int
+-ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
++ListAddDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
+ {
+     DRI2ClientEventsPtr pClientPriv;
+     pClientPriv = GetDRI2ClientEvents(client);
+@@ -547,12 +554,12 @@ ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
+         return BadAlloc;
+     }
+ 
+-    list_add(entry, &pClientPriv->reference_list);
++    xorg_list_add(entry, &pClientPriv->reference_list);
+     return 0;
+ }
+ 
+ static void
+-ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
++ListDelDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
+ {
+     DRI2ClientEventsPtr pClientPriv;
+     pClientPriv = GetDRI2ClientEvents(client);
+@@ -560,7 +567,7 @@ ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
+     if (!pClientPriv) {
+         return;
+     }
+-    list_del(entry);
++    xorg_list_del(entry);
+ }
+ 
+ static void
+@@ -574,7 +581,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
+ 
+     switch (pClient->clientState) {
+     case ClientStateInitial:
+-        list_init(&pClientEventsPriv->reference_list);
++        xorg_list_init(&pClientEventsPriv->reference_list);
+         break;
+     case ClientStateRunning:
+         break;
+@@ -582,7 +589,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
+     case ClientStateRetained:
+     case ClientStateGone:
+         if (pClientEventsPriv) {
+-            list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
++            xorg_list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
+                 ref->valid = FALSE;
+             }
+         }
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-evergreen.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-evergreen.patch
new file mode 100644
index 0000000..6e97a38
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-evergreen.patch
@@ -0,0 +1,287 @@
+From cac2d7ed54918579418fc762558497d3ec547fad Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@×××.com>
+Date: Sat, 14 Apr 2012 12:53:39 +0000
+Subject: EXA: Support acceleration of solid pictures on Evergreen/NI.
+
+Signed-off-by: Alex Deucher <alexander.deucher@×××.com>
+Reviewed-by: Michel Dänzer <michel.daenzer@×××.com>
+---
+diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
+index cee3ec2..61b47a4 100644
+--- a/src/evergreen_exa.c
++++ b/src/evergreen_exa.c
+@@ -748,17 +748,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict,
+ 					   int op,
+ 					   int unit)
+ {
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+     unsigned int i;
+-    int max_tex_w, max_tex_h;
+-
+-    max_tex_w = 16384;
+-    max_tex_h = 16384;
+-
+-    if ((w > max_tex_w) || (h > max_tex_h))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+ 
+     for (i = 0; i < sizeof(EVERGREENTexFormats) / sizeof(EVERGREENTexFormats[0]); i++) {
+ 	if (EVERGREENTexFormats[i].fmt == pPict->format)
+@@ -798,9 +789,16 @@ static void EVERGREENXFormSetup(PicturePtr pPict, PixmapPtr pPix,
+     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     int const_offset = unit * 8;
++    int w, h;
++
++    if (pPict->pDrawable) {
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++    } else {
++	w = 1;
++	h = 1;
++    }
+ 
+     if (pPict->transform != 0) {
+ 	accel_state->is_transform[unit] = TRUE;
+@@ -837,9 +835,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    unsigned int repeatType;
+     unsigned int i;
+     tex_resource_t  tex_res;
+     tex_sampler_t   tex_samp;
+@@ -854,9 +850,17 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     }
+ 
+     /* Texture */
++    if (pPict->pDrawable) {
++	tex_res.w               = pPict->pDrawable->width;
++	tex_res.h               = pPict->pDrawable->height;
++	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	tex_res.w               = 1;
++	tex_res.h               = 1;
++	repeatType              = RepeatNormal;
++    }
++
+     tex_res.id                  = unit;
+-    tex_res.w                   = w;
+-    tex_res.h                   = h;
+     tex_res.pitch               = accel_state->src_obj[unit].pitch;
+     tex_res.depth               = 0;
+     tex_res.dim                 = SQ_TEX_DIM_2D;
+@@ -1054,33 +1058,30 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
+ {
+     uint32_t tmp1;
+     PixmapPtr pSrcPixmap, pDstPixmap;
+-    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
+ 
+     /* Check for unsupported compositing operations. */
+     if (op >= (int) (sizeof(EVERGREENBlendOp) / sizeof(EVERGREENBlendOp[0])))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
++    if (pSrcPicture->pDrawable) {
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+ 
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+-
+-    max_tex_w = 8192;
+-    max_tex_h = 8192;
+-    max_dst_w = 8192;
+-    max_dst_h = 8192;
++	if (pSrcPixmap->drawable.width >= 16384 ||
++	    pSrcPixmap->drawable.height >= 16384) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
+ 
+-    if (pSrcPixmap->drawable.width >= max_tex_w ||
+-	pSrcPixmap->drawable.height >= max_tex_h) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
++	if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
++	    return FALSE;
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+-    if (pDstPixmap->drawable.width >= max_dst_w ||
+-	pDstPixmap->drawable.height >= max_dst_h) {
++    if (pDstPixmap->drawable.width >= 16384 ||
++	pDstPixmap->drawable.height >= 16384) {
+ 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
+ 			 pDstPixmap->drawable.width,
+ 			 pDstPixmap->drawable.height));
+@@ -1089,38 +1090,35 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	if (pMaskPixmap->drawable.width >= max_tex_w ||
+-	    pMaskPixmap->drawable.height >= max_tex_h) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width >= 16384 ||
++		pMaskPixmap->drawable.height >= 16384) {
++	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++			       pMaskPixmap->drawable.width,
++			       pMaskPixmap->drawable.height));
++	    }
+ 
+-	if (pMaskPicture->componentAlpha) {
+-	    /* Check if it's component alpha that relies on a source alpha and
+-	     * on the source value.  We can only get one of those into the
+-	     * single source value that we get to blend with.
+-	     */
+-	    if (EVERGREENBlendOp[op].src_alpha &&
+-		(EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
+-		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
+-		RADEON_FALLBACK(("Component alpha not supported with source "
+-				 "alpha and source value blending.\n"));
++	    if (pMaskPicture->componentAlpha) {
++		/* Check if it's component alpha that relies on a source alpha and
++		 * on the source value.  We can only get one of those into the
++		 * single source value that we get to blend with.
++		 */
++		if (EVERGREENBlendOp[op].src_alpha &&
++		    (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
++		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
++		    RADEON_FALLBACK(("Component alpha not supported with source "
++				     "alpha and source value blending.\n"));
++		}
+ 	    }
+-	}
+ 
+-	if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
+-	    return FALSE;
++	    if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
++		return FALSE;
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+     }
+ 
+-    if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
+-	return FALSE;
+-
+     if (!EVERGREENGetDestFormat(pDstPicture, &tmp1))
+ 	return FALSE;
+ 
+@@ -1132,7 +1130,8 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
+ 				      PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 				      PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+     uint32_t dst_format;
+@@ -1142,13 +1141,19 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
+     struct r600_accel_object src_obj, mask_obj, dst_obj;
+     float *cbuf;
+ 
+-    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
++    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
+ 	return FALSE;
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+     src_obj.offset = 0;
+     dst_obj.offset = 0;
+-    src_obj.bo = radeon_get_pixmap_bo(pSrc);
+     dst_obj.bo = radeon_get_pixmap_bo(pDst);
++    src_obj.bo = radeon_get_pixmap_bo(pSrc);
+     dst_obj.surface = radeon_get_pixmap_surface(pDst);
+     src_obj.surface = radeon_get_pixmap_surface(pSrc);
+     dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
+@@ -1166,7 +1171,15 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
+     dst_obj.bpp = pDst->drawable.bitsPerPixel;
+     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
+ 
+-    if (pMask) {
++    if (pMaskPicture) {
++	if (!pMask) {
++	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
++	    if (!pMask) {
++		if (!pSrcPicture->pDrawable)
++		    pScreen->DestroyPixmap(pSrc);
++		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	    }
++	}
+ 	mask_obj.offset = 0;
+ 	mask_obj.bo = radeon_get_pixmap_bo(pMask);
+ 	mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask);
+@@ -1363,11 +1376,9 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
+     return TRUE;
+ }
+ 
+-static void EVERGREENDoneComposite(PixmapPtr pDst)
++static void EVERGREENFinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
++				     struct radeon_accel_state *accel_state)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+-    RADEONInfoPtr info = RADEONPTR(pScrn);
+-    struct radeon_accel_state *accel_state = info->accel_state;
+     int vtx_size;
+ 
+     if (accel_state->vsync)
+@@ -1381,6 +1392,22 @@ static void EVERGREENDoneComposite(PixmapPtr pDst)
+     evergreen_finish_op(pScrn, vtx_size);
+ }
+ 
++static void EVERGREENDoneComposite(PixmapPtr pDst)
++{
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++    RADEONInfoPtr info = RADEONPTR(pScrn);
++    struct radeon_accel_state *accel_state = info->accel_state;
++
++    EVERGREENFinishComposite(pScrn, pDst, accel_state);
++
++    if (!accel_state->src_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->src_pix);
++
++    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->msk_pix);
++}
++
+ static void EVERGREENComposite(PixmapPtr pDst,
+ 			       int srcX, int srcY,
+ 			       int maskX, int maskY,
+@@ -1393,7 +1420,7 @@ static void EVERGREENComposite(PixmapPtr pDst,
+     float *vb;
+ 
+     if (CS_FULL(info->cs)) {
+-	EVERGREENDoneComposite(info->accel_state->dst_pix);
++	EVERGREENFinishComposite(pScrn, pDst, info->accel_state);
+ 	radeon_cs_flush_indirect(pScrn);
+ 	EVERGREENPrepareComposite(info->accel_state->composite_op,
+ 				  info->accel_state->src_pic,
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r100.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r100.patch
new file mode 100644
index 0000000..2397d08
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r100.patch
@@ -0,0 +1,179 @@
+From a7754b076e355fef3aea082b6e2d3aefbb8e7a9b Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@×××.com>
+Date: Fri, 13 Apr 2012 17:24:46 +0000
+Subject: EXA: Support acceleration of solid pictures on R1xx.
+
+Signed-off-by: Alex Deucher <alexander.deucher@×××.com>
+Reviewed-by: Michel Dänzer <michel.daenzer@×××.com>
+---
+diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
+index b6cc9e4..451a625 100644
+--- a/src/radeon_exa_render.c
++++ b/src/radeon_exa_render.c
+@@ -338,17 +338,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
+ 				      int unit)
+ {
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     int i;
+ 
+-    /* r100 limit should be 2048, there are issues with 2048
+-     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
+-     */
+-
+-    if ((w > 2047) || (h > 2047))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+-
+     for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) {
+ 	if (R100TexFormats[i].fmt == pPict->format)
+ 	    break;
+@@ -357,7 +348,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
+ 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
+ 			(int)pPict->format));
+ 
+-    if (!RADEONCheckTexturePOT(pPict, unit == 0))
++    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
+ 	return FALSE;
+ 
+     if (pPict->filter != PictFilterNearest &&
+@@ -392,15 +383,24 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
+ {
+     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
+     uint32_t txfilter, txformat, txoffset, txpitch;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
+-	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
+-    int i;
++    unsigned int repeatType;
++    Bool repeat;
++    int i, w, h;
+     struct radeon_exa_pixmap_priv *driver_priv;
+     ACCEL_PREAMBLE();
+ 
++    if (pPict->pDrawable) {
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	w = h = 1;
++	repeatType = RepeatNormal;
++    }
++
++    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
++	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
++
+     txpitch = exaGetPixmapPitch(pPix);
+     txoffset = 0;
+ 
+@@ -510,22 +510,6 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
+     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-    /* r100 limit should be 2048, there are issues with 2048
+-     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
+-     */
+-
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+-
+-    if (pSrcPixmap->drawable.width > 2047 ||
+-	pSrcPixmap->drawable.height > 2047) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
+-
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+     if (pDstPixmap->drawable.width > 2047 ||
+@@ -535,20 +519,35 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
+ 			 pDstPixmap->drawable.height));
+     }
+ 
++    if (pSrcPicture->pDrawable) {
++	/* r100 limit should be 2048, there are issues with 2048
++	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
++	 */
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
++
++	if (pSrcPixmap->drawable.width > 2047 ||
++	    pSrcPixmap->drawable.height > 2047) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
++
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	if (pMaskPixmap->drawable.width > 2047 ||
+-	    pMaskPixmap->drawable.height > 2047) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width > 2047 ||
++		pMaskPixmap->drawable.height > 2047) {
++		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++				 pMaskPixmap->drawable.width,
++				 pMaskPixmap->drawable.height));
++	    }
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+ 	if (pMaskPicture->componentAlpha) {
+ 	    /* Check if it's component alpha that relies on a source alpha and
+@@ -624,7 +623,8 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
+ 					    PixmapPtr pMask,
+ 					    PixmapPtr pDst)
+ {
+-    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    RINFO_FROM_SCREEN(pScreen);
+     uint32_t dst_format, dst_pitch, colorpitch;
+     uint32_t pp_cntl, blendcntl, cblend, ablend;
+     int pixel_shift;
+@@ -648,12 +648,27 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
+ 
+     CHECK_OFFSET(pDst, 0x0f, "destination");
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
+ 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
+ 
+     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
+ 	return FALSE;
+ 
++    if (pMaskPicture && !pMask) {
++	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
++	if (!pMask) {
++	    if (!pSrcPicture->pDrawable)
++		pScreen->DestroyPixmap(pSrc);
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	}
++    }
++
+     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
+ 			     pSrc, pMask, pDst);
+ 
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r200.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r200.patch
new file mode 100644
index 0000000..ff744ee
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r200.patch
@@ -0,0 +1,176 @@
+From 0bda305f7ab2a4720b3fea3f318ab2a73be151e5 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@×××.com>
+Date: Fri, 13 Apr 2012 17:28:10 +0000
+Subject: EXA: Support acceleration of solid pictures on R2xx.
+
+Signed-off-by: Alex Deucher <alexander.deucher@×××.com>
+Reviewed-by: Michel Dänzer <michel.daenzer@×××.com>
+---
+diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
+index 451a625..7f1a3ff 100644
+--- a/src/radeon_exa_render.c
++++ b/src/radeon_exa_render.c
+@@ -756,17 +756,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
+ 				      int unit)
+ {
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     int i;
+ 
+-    /* r200 limit should be 2048, there are issues with 2048
+-     * see bug 19269
+-     */
+-
+-    if ((w > 2047) || (h > 2047))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+-
+     for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++)
+     {
+ 	if (R200TexFormats[i].fmt == pPict->format)
+@@ -776,7 +767,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
+ 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
+ 			 (int)pPict->format));
+ 
+-    if (!RADEONCheckTexturePOT(pPict, unit == 0))
++    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
+ 	return FALSE;
+ 
+     if (pPict->filter != PictFilterNearest &&
+@@ -809,15 +800,24 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
+ {
+     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
+     uint32_t txfilter, txformat, txoffset, txpitch;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
+-	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
+-    int i;
++    unsigned int repeatType;
++    Bool repeat;
++    int i, w, h;
+     struct radeon_exa_pixmap_priv *driver_priv;
+     ACCEL_PREAMBLE();
+ 
++    if (pPict->pDrawable) {
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	w = h = 1;
++	repeatType = RepeatNormal;
++    }
++
++    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
++	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
++
+     txpitch = exaGetPixmapPitch(pPix);
+ 
+     txoffset = 0;
+@@ -926,22 +926,6 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-    /* r200 limit should be 2048, there are issues with 2048
+-     * see bug 19269
+-     */
+-
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+-
+-    if (pSrcPixmap->drawable.width > 2047 ||
+-	pSrcPixmap->drawable.height > 2047) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
+-
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+     if (pDstPixmap->drawable.width > 2047 ||
+@@ -951,20 +935,35 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+ 			 pDstPixmap->drawable.height));
+     }
+ 
++    if (pSrcPicture->pDrawable) {
++	/* r200 limit should be 2048, there are issues with 2048
++	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
++	 */
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
++
++	if (pSrcPixmap->drawable.width > 2047 ||
++	    pSrcPixmap->drawable.height > 2047) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
++
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	if (pMaskPixmap->drawable.width > 2047 ||
+-	    pMaskPixmap->drawable.height > 2047) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width > 2047 ||
++		pMaskPixmap->drawable.height > 2047) {
++		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++				 pMaskPixmap->drawable.width,
++				 pMaskPixmap->drawable.height));
++	    }
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+ 	if (pMaskPicture->componentAlpha) {
+ 	    /* Check if it's component alpha that relies on a source alpha and
+@@ -997,7 +996,8 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
+ 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    RINFO_FROM_SCREEN(pScreen);
+     uint32_t dst_format, dst_pitch;
+     uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch;
+     int pixel_shift;
+@@ -1024,9 +1024,24 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
+     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
+ 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
+ 	return FALSE;
+ 
++    if (pMaskPicture && !pMask) {
++	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
++	if (!pMask) {
++	    if (!pSrcPicture->pDrawable)
++		pScreen->DestroyPixmap(pSrc);
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	}
++    }
++
+     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
+ 			     pSrc, pMask, pDst);
+ 
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r300.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r300.patch
new file mode 100644
index 0000000..819173c
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.4-exa-solid-accel-r300.patch
@@ -0,0 +1,560 @@
+From d88b9700137ee407c483f263bb55c77cd6f92fef Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@×××.com>
+Date: Fri, 13 Apr 2012 07:35:38 +0000
+Subject: EXA: Support acceleration of solid pictures on R3xx-R7xx.
+
+Allocate 1x1 scratch pixmaps to hold the solid picture colours.
+
+Signed-off-by: Michel Dänzer <michel.daenzer@×××.com>
+---
+diff --git a/src/r600_exa.c b/src/r600_exa.c
+index e1eb62f..c3ae553 100644
+--- a/src/r600_exa.c
++++ b/src/r600_exa.c
+@@ -901,17 +901,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict,
+ 				      int op,
+ 				      int unit)
+ {
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+     unsigned int i;
+-    int max_tex_w, max_tex_h;
+-
+-    max_tex_w = 8192;
+-    max_tex_h = 8192;
+-
+-    if ((w > max_tex_w) || (h > max_tex_h))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+ 
+     for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) {
+ 	if (R600TexFormats[i].fmt == pPict->format)
+@@ -951,9 +942,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    unsigned int repeatType;
+     unsigned int i;
+     tex_resource_t  tex_res;
+     tex_sampler_t   tex_samp;
+@@ -969,9 +958,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
+     }
+ 
+     /* Texture */
++    if (pPict->pDrawable) {
++	tex_res.w               = pPict->pDrawable->width;
++	tex_res.h               = pPict->pDrawable->height;
++	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	tex_res.w               = 1;
++	tex_res.h               = 1;
++	repeatType              = RepeatNormal;
++    }
+     tex_res.id                  = unit;
+-    tex_res.w                   = w;
+-    tex_res.h                   = h;
+     tex_res.pitch               = accel_state->src_obj[unit].pitch;
+     tex_res.depth               = 0;
+     tex_res.dim                 = SQ_TEX_DIM_2D;
+@@ -1170,24 +1166,24 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
+ 	vs_alu_consts[0] = xFixedToFloat(pPict->transform->matrix[0][0]);
+ 	vs_alu_consts[1] = xFixedToFloat(pPict->transform->matrix[0][1]);
+ 	vs_alu_consts[2] = xFixedToFloat(pPict->transform->matrix[0][2]);
+-	vs_alu_consts[3] = 1.0 / w;
++	vs_alu_consts[3] = 1.0 / tex_res.w;
+ 
+ 	vs_alu_consts[4] = xFixedToFloat(pPict->transform->matrix[1][0]);
+ 	vs_alu_consts[5] = xFixedToFloat(pPict->transform->matrix[1][1]);
+ 	vs_alu_consts[6] = xFixedToFloat(pPict->transform->matrix[1][2]);
+-	vs_alu_consts[7] = 1.0 / h;
++	vs_alu_consts[7] = 1.0 / tex_res.h;
+     } else {
+ 	accel_state->is_transform[unit] = FALSE;
+ 
+ 	vs_alu_consts[0] = 1.0;
+ 	vs_alu_consts[1] = 0.0;
+ 	vs_alu_consts[2] = 0.0;
+-	vs_alu_consts[3] = 1.0 / w;
++	vs_alu_consts[3] = 1.0 / tex_res.w;
+ 
+ 	vs_alu_consts[4] = 0.0;
+ 	vs_alu_consts[5] = 1.0;
+ 	vs_alu_consts[6] = 0.0;
+-	vs_alu_consts[7] = 1.0 / h;
++	vs_alu_consts[7] = 1.0 / tex_res.h;
+     }
+ 
+     /* VS alu constants */
+@@ -1202,33 +1198,30 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+ {
+     uint32_t tmp1;
+     PixmapPtr pSrcPixmap, pDstPixmap;
+-    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
+ 
+     /* Check for unsupported compositing operations. */
+     if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0])))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
++    if (pSrcPicture->pDrawable) {
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+ 
+-    max_tex_w = 8192;
+-    max_tex_h = 8192;
+-    max_dst_w = 8192;
+-    max_dst_h = 8192;
++	if (pSrcPixmap->drawable.width >= 8192 ||
++	    pSrcPixmap->drawable.height >= 8192) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
+ 
+-    if (pSrcPixmap->drawable.width >= max_tex_w ||
+-	pSrcPixmap->drawable.height >= max_tex_h) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
++	if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
++	    return FALSE;
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+-    if (pDstPixmap->drawable.width >= max_dst_w ||
+-	pDstPixmap->drawable.height >= max_dst_h) {
++    if (pDstPixmap->drawable.width >= 8192 ||
++	pDstPixmap->drawable.height >= 8192) {
+ 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
+ 			 pDstPixmap->drawable.width,
+ 			 pDstPixmap->drawable.height));
+@@ -1237,38 +1230,35 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+-
+-	if (pMaskPixmap->drawable.width >= max_tex_w ||
+-	    pMaskPixmap->drawable.height >= max_tex_h) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width >= 8192 ||
++		pMaskPixmap->drawable.height >= 8192) {
++	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++			       pMaskPixmap->drawable.width,
++			       pMaskPixmap->drawable.height));
++	    }
+ 
+-	if (pMaskPicture->componentAlpha) {
+-	    /* Check if it's component alpha that relies on a source alpha and
+-	     * on the source value.  We can only get one of those into the
+-	     * single source value that we get to blend with.
+-	     */
+-	    if (R600BlendOp[op].src_alpha &&
+-		(R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
+-		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
+-		RADEON_FALLBACK(("Component alpha not supported with source "
+-				 "alpha and source value blending.\n"));
++	    if (pMaskPicture->componentAlpha) {
++		/* Check if it's component alpha that relies on a source alpha and
++		 * on the source value.  We can only get one of those into the
++		 * single source value that we get to blend with.
++		 */
++		if (R600BlendOp[op].src_alpha &&
++		    (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
++		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
++		    RADEON_FALLBACK(("Component alpha not supported with source "
++				     "alpha and source value blending.\n"));
++		}
+ 	    }
+-	}
+ 
+-	if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
+-	    return FALSE;
++	    if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
++		return FALSE;
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+     }
+ 
+-    if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
+-	return FALSE;
+-
+     if (!R600GetDestFormat(pDstPicture, &tmp1))
+ 	return FALSE;
+ 
+@@ -1280,7 +1270,8 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
+ 				 PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 				 PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+     struct radeon_accel_state *accel_state = info->accel_state;
+     uint32_t dst_format;
+@@ -1288,15 +1279,21 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
+     shader_config_t vs_conf, ps_conf;
+     struct r600_accel_object src_obj, mask_obj, dst_obj;
+ 
+-    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
++    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
+ 	return FALSE;
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+ #if defined(XF86DRM_MODE)
+     if (info->cs) {
+ 	src_obj.offset = 0;
+ 	dst_obj.offset = 0;
+-	src_obj.bo = radeon_get_pixmap_bo(pSrc);
+ 	dst_obj.bo = radeon_get_pixmap_bo(pDst);
++	src_obj.bo = radeon_get_pixmap_bo(pSrc);
+ 	dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
+ 	src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc);
+ 	dst_obj.surface = radeon_get_pixmap_surface(pDst);
+@@ -1322,7 +1319,16 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
+     dst_obj.bpp = pDst->drawable.bitsPerPixel;
+     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
+ 
+-    if (pMask) {
++    if (pMaskPicture) {
++	if (!pMask) {
++	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
++	    if (!pMask) {
++		if (!pSrcPicture->pDrawable)
++		    pScreen->DestroyPixmap(pSrc);
++		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	    }
++	}
++
+ #if defined(XF86DRM_MODE)
+ 	if (info->cs) {
+ 	    mask_obj.offset = 0;
+@@ -1509,11 +1515,9 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
+     return TRUE;
+ }
+ 
+-static void R600DoneComposite(PixmapPtr pDst)
++static void R600FinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
++				struct radeon_accel_state *accel_state)
+ {
+-    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
+-    RADEONInfoPtr info = RADEONPTR(pScrn);
+-    struct radeon_accel_state *accel_state = info->accel_state;
+     int vtx_size;
+ 
+     if (accel_state->vsync)
+@@ -1527,6 +1531,22 @@ static void R600DoneComposite(PixmapPtr pDst)
+     r600_finish_op(pScrn, vtx_size);
+ }
+ 
++static void R600DoneComposite(PixmapPtr pDst)
++{
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
++    RADEONInfoPtr info = RADEONPTR(pScrn);
++    struct radeon_accel_state *accel_state = info->accel_state;
++
++    R600FinishComposite(pScrn, pDst, accel_state);
++
++    if (!accel_state->src_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->src_pix);
++
++    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->msk_pix);
++}
++
+ static void R600Composite(PixmapPtr pDst,
+ 			  int srcX, int srcY,
+ 			  int maskX, int maskY,
+@@ -1543,7 +1563,7 @@ static void R600Composite(PixmapPtr pDst,
+ 
+ #ifdef XF86DRM_MODE
+     if (info->cs && CS_FULL(info->cs)) {
+-	R600DoneComposite(info->accel_state->dst_pix);
++	R600FinishComposite(pScrn, pDst, info->accel_state);
+ 	radeon_cs_flush_indirect(pScrn);
+ 	R600PrepareComposite(info->accel_state->composite_op,
+ 			     info->accel_state->src_pic,
+diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
+index e5c231f..b6cc9e4 100644
+--- a/src/radeon_exa_render.c
++++ b/src/radeon_exa_render.c
+@@ -299,8 +299,8 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict,
+     if (repeatType == RepeatNormal || repeatType == RepeatReflect) {
+ 	Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix);
+ 	
+-	int w = pPict->pDrawable->width;
+-	int h = pPict->pDrawable->height;
++	int w = pPict->pDrawable ? pPict->pDrawable->width : 1;
++	int h = pPict->pDrawable ? pPict->pDrawable->height : 1;
+ 	
+ 	if (pPict->transform) {
+ 	    if (badPitch)
+@@ -1112,23 +1112,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
+     ScreenPtr pScreen = pDstPict->pDrawable->pScreen;
+     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+-
+     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
+     int i;
+-    int max_tex_w, max_tex_h;
+-
+-    if (is_r500) {
+-	max_tex_w = 4096;
+-	max_tex_h = 4096;
+-    } else {
+-	max_tex_w = 2048;
+-	max_tex_h = 2048;
+-    }
+-
+-    if ((w > max_tex_w) || (h > max_tex_h))
+-	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
+ 
+     for (i = 0; i < sizeof(R300TexFormats) / sizeof(R300TexFormats[0]); i++)
+     {
+@@ -1139,7 +1124,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
+ 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
+ 			 (int)pPict->format));
+ 
+-    if (!RADEONCheckTexturePOT(pPict, unit == 0)) {
++    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) {
+ 	if (info->cs) {
+     		struct radeon_exa_pixmap_priv *driver_priv;
+ 		PixmapPtr pPix;
+@@ -1181,15 +1166,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
+ {
+     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
+     uint32_t txfilter, txformat0, txformat1, txoffset, txpitch, us_format = 0;
+-    int w = pPict->pDrawable->width;
+-    int h = pPict->pDrawable->height;
++    int w, h;
+     int i, pixel_shift, out_size = 6;
+-    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    unsigned int repeatType;
+     struct radeon_exa_pixmap_priv *driver_priv;
+     ACCEL_PREAMBLE();
+ 
+     TRACE;
+ 
++    if (pPict->pDrawable) {
++	w = pPict->pDrawable->width;
++	h = pPict->pDrawable->height;
++	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
++    } else {
++	w = h = 1;
++	repeatType = RepeatNormal;
++    }
++
+     txpitch = exaGetPixmapPitch(pPix);
+     txoffset = 0;
+ 
+@@ -1394,11 +1387,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
+ 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
+ 
+-    if (!pSrcPicture->pDrawable)
+-	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
+-
+-    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
+-
+     if (IS_R500_3D) {
+ 	max_tex_w = 4096;
+ 	max_tex_h = 4096;
+@@ -1416,13 +1404,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+ 	}
+     }
+ 
+-    if (pSrcPixmap->drawable.width > max_tex_w ||
+-	pSrcPixmap->drawable.height > max_tex_h) {
+-	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
+-			 pSrcPixmap->drawable.width,
+-			 pSrcPixmap->drawable.height));
+-    }
+-
+     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
+ 
+     if (pDstPixmap->drawable.width > max_dst_w ||
+@@ -1432,20 +1413,32 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
+ 			 pDstPixmap->drawable.height));
+     }
+ 
++    if (pSrcPicture->pDrawable) {
++	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
++
++	if (pSrcPixmap->drawable.width > max_tex_w ||
++	    pSrcPixmap->drawable.height > max_tex_h) {
++	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
++			     pSrcPixmap->drawable.width,
++			     pSrcPixmap->drawable.height));
++	}
++    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
++
+     if (pMaskPicture) {
+ 	PixmapPtr pMaskPixmap;
+ 
+-	if (!pMaskPicture->pDrawable)
+-	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
++	if (pMaskPicture->pDrawable) {
++	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+ 
+-	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
+-
+-	if (pMaskPixmap->drawable.width > max_tex_w ||
+-	    pMaskPixmap->drawable.height > max_tex_h) {
+-	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
+-			     pMaskPixmap->drawable.width,
+-			     pMaskPixmap->drawable.height));
+-	}
++	    if (pMaskPixmap->drawable.width > max_tex_w ||
++		pMaskPixmap->drawable.height > max_tex_h) {
++	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
++			       pMaskPixmap->drawable.width,
++			       pMaskPixmap->drawable.height));
++	    }
++	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
++	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
+ 
+ 	if (pMaskPicture->componentAlpha) {
+ 	    /* Check if it's component alpha that relies on a source alpha and
+@@ -1479,7 +1472,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+ 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
+ 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
+ {
+-    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    RINFO_FROM_SCREEN(pScreen);
+     uint32_t dst_format, dst_pitch;
+     uint32_t txenable, colorpitch;
+     uint32_t blendcntl, output_fmt;
+@@ -1508,9 +1502,24 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
+ 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
+ 
++    if (!pSrc) {
++	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
++	if (!pSrc)
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++    }
++
+     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE))
+ 	return FALSE;
+ 
++    if (pMaskPicture && !pMask) {
++	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
++	if (!pMask) {
++	    if (!pSrcPicture->pDrawable)
++		pScreen->DestroyPixmap(pSrc);
++	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
++	}
++    }
++
+     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
+ 			     pSrc, pMask, pDst);
+ 
+@@ -2132,7 +2141,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+     return TRUE;
+ }
+ 
+-static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
++static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst)
+ {
+     RINFO_FROM_SCREEN(pDst->drawable.pScreen);
+     ACCEL_PREAMBLE();
+@@ -2179,6 +2188,20 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
+     LEAVE_DRAW(0);
+ }
+ 
++static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
++{
++    ScreenPtr pScreen = pDst->drawable.pScreen;
++    RINFO_FROM_SCREEN(pScreen);
++    struct radeon_accel_state *accel_state = info->accel_state;
++
++    FUNC_NAME(RadeonFinishComposite)(pDst);
++
++    if (!accel_state->src_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->src_pix);
++
++    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
++	pScreen->DestroyPixmap(accel_state->msk_pix);
++}
+ 
+ #ifdef ACCEL_CP
+ 
+@@ -2257,7 +2280,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
+     if ((info->cs && CS_FULL(info->cs)) ||
+ 	(!info->cs && (info->cp->indirectBuffer->used + 4 * 32) >
+ 	 info->cp->indirectBuffer->total)) {
+-	FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix);
++	FUNC_NAME(RadeonFinishComposite)(info->accel_state->dst_pix);
+ 	if (info->cs)
+ 	    radeon_cs_flush_indirect(pScrn);
+ 	else
+diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c
+index be1d2fa..28dc335 100644
+--- a/src/radeon_exa_shared.c
++++ b/src/radeon_exa_shared.c
+@@ -126,6 +126,25 @@ Bool RADEONCheckBPP(int bpp)
+ 	return FALSE;
+ }
+ 
++PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid)
++{
++    PixmapPtr pPix = pScreen->CreatePixmap(pScreen, 1, 1, 32, 0);
++    struct radeon_bo *bo;
++
++    exaMoveInPixmap(pPix);
++    bo = radeon_get_pixmap_bo(pPix);
++
++    if (radeon_bo_map(bo, 1)) {
++	pScreen->DestroyPixmap(pPix);
++	return NULL;
++    }
++
++    memcpy(bo->ptr, &solid, 4);
++    radeon_bo_unmap(bo);
++
++    return pPix;
++}
++
+ static Bool radeon_vb_get(ScrnInfoPtr pScrn)
+ {
+     RADEONInfoPtr info = RADEONPTR(pScrn);
+diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h
+index 7b8b5ca..60a1045 100644
+--- a/src/radeon_exa_shared.h
++++ b/src/radeon_exa_shared.h
+@@ -40,6 +40,7 @@ extern void RADEONVlineHelperClear(ScrnInfoPtr pScrn);
+ extern void RADEONVlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2);
+ extern Bool RADEONValidPM(uint32_t pm, int bpp);
+ extern Bool RADEONCheckBPP(int bpp);
++extern PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid);
+ 
+ #define RADEON_TRACE_FALL 0
+ #define RADEON_TRACE_DRAW 0
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.2.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.2.ebuild
new file mode 100644
index 0000000..53e7664
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.13.2.ebuild,v 1.7 2011/02/12 19:13:11 armin76 Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="alpha amd64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.6.3[-minimal]"
+DEPEND="${RDEPEND}
+	|| ( <x11-libs/libdrm-2.4.22 x11-libs/libdrm[video_cards_radeon] )
+	x11-proto/fontsproto
+	x11-proto/glproto
+	x11-proto/randrproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86driproto
+	x11-proto/xf86miscproto
+	x11-proto/xproto"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="
+		--enable-dri
+		--enable-kms
+	"
+}

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild
new file mode 100644
index 0000000..d1f425c
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.0.ebuild,v 1.7 2011/03/05 18:09:51 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.6.3[-minimal]"
+DEPEND="${RDEPEND}
+	|| ( <x11-libs/libdrm-2.4.22 x11-libs/libdrm[video_cards_radeon] )
+	x11-proto/fontsproto
+	x11-proto/glproto
+	x11-proto/randrproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86driproto
+	x11-proto/xf86miscproto
+	x11-proto/xproto"
+
+PATCHES=(
+	"${FILESDIR}/${P}-xorg-server-1.10.patch"
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="
+		--enable-dri
+		--enable-kms
+	"
+}

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.1.ebuild
new file mode 100644
index 0000000..6ce4117
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.1.ebuild,v 1.6 2011/07/15 17:07:43 xarthisius Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[video_cards_radeon]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="
+		--enable-dri
+		--enable-kms
+		--enable-exa
+	"
+}

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.2.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.2.ebuild
new file mode 100644
index 0000000..5c1e206
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.2.ebuild,v 1.6 2011/07/30 10:48:00 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[video_cards_radeon]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-dri
+		--enable-kms
+		--enable-exa
+	)
+}

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild
new file mode 100644
index 0000000..240a8ae
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild,v 1.1 2012/03/18 23:26:25 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+XORG_EAUTORECONF=yes
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[video_cards_radeon]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.3-xorg-server-1.12.patch
+	"${FILESDIR}"/${PN}-6.14.3-pcitag.patch
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-dri
+		--enable-kms
+		--enable-exa
+	)
+}

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild
new file mode 100644
index 0000000..f0c6fb7
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild,v 1.7 2012/03/08 00:54:03 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+XORG_EAUTORECONF=yes
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[video_cards_radeon]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.3-xorg-server-1.12.patch
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-dri
+		--enable-kms
+		--enable-exa
+	)
+}

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
new file mode 100644
index 0000000..affada1
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4-r1.ebuild,v 1.6 2012/06/24 19:05:06 ago Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.33[video_cards_radeon]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.4-exa-solid-accel-r300.patch
+	"${FILESDIR}"/${PN}-6.14.4-exa-solid-accel-evergreen.patch
+	"${FILESDIR}"/${PN}-6.14.4-exa-solid-accel-r100.patch
+	"${FILESDIR}"/${PN}-6.14.4-exa-solid-accel-r200.patch
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-dri
+		--enable-kms
+		--enable-exa
+	)
+}

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4.ebuild
new file mode 100644
index 0000000..7694d7d
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.4.ebuild,v 1.1 2012/03/29 15:40:51 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+XORG_EAUTORECONF=yes
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.31[video_cards_radeon]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-dri
+		--enable-kms
+		--enable-exa
+	)
+}

diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.5.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.5.ebuild
new file mode 100644
index 0000000..7b25ecc
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.5.ebuild,v 1.1 2012/06/08 13:13:08 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.35[video_cards_radeon]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-dri
+		--enable-kms
+		--enable-exa
+	)
+}

diff --git a/x11-drivers/xf86-video-chips/Manifest b/x11-drivers/xf86-video-chips/Manifest
new file mode 100644
index 0000000..64ee525
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/Manifest
@@ -0,0 +1,4 @@
+DIST xf86-video-chips-1.2.4.tar.bz2 365618 RMD160 ebae9edc31d8463d7abb5dadf72bb5edd7f32870 SHA1 71f474335d05f93b2451a7a0750c4409669641a4 SHA256 fb6dc34a8d7db82dc6d555cebe6f95c2269dda4872118978345f6e1215ab4d25
+EBUILD xf86-video-chips-1.2.4.ebuild 376 RMD160 9dff33e4c93d841beac80b2ce43a6e1f3d081bc2 SHA1 2b121aea9932c16315adfa37cb1a689532b9bf04 SHA256 e23d1a6cab6587713a113de3bea608b08c53697b755955f3624c2e50abc6b2cb
+MISC ChangeLog 6858 RMD160 13b8d0657a4adfe39e62ff2b31e8b6bdb85efd7a SHA1 99b6a89f036769edfd4c67aaf2ede5710cf6fc38 SHA256 05a355902813eeb205eb4af6b733a3b3738ee63fad1270915285a8a19713a133
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.4.ebuild b/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.4.ebuild
new file mode 100644
index 0000000..272c3a7
--- /dev/null
+++ b/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-chips/xf86-video-chips-1.2.4.ebuild,v 1.6 2011/04/16 18:01:09 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Chips and Technologies video driver"
+
+KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
+IUSE=""

diff --git a/x11-drivers/xf86-video-cirrus/Manifest b/x11-drivers/xf86-video-cirrus/Manifest
new file mode 100644
index 0000000..67eb543
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/Manifest
@@ -0,0 +1,10 @@
+AUX xf86-video-cirrus-1.3.2-pcitag-declare.patch 1092 RMD160 15e7d16c5ea9ba82e4a6e6a528d57551ad330f43 SHA1 18fd7e91017385523a303f830e3e9b9e5f063b7c SHA256 15de254bce6f05267ea08e2faf612c5a15de6776df61ac9a3b6d2a2d5dc2d731
+AUX xf86-video-cirrus-1.3.2-pcitag-redefine.patch 1008 RMD160 c9cbccde13dfb42edde1746d7b69df83e45715ed SHA1 512f272fcbb79e92ecfb6d855b74a2f02edb7eab SHA256 be7743388f250afc5c4763c93762b002156d94eee6ef03761ec93b7faae53c8b
+AUX xf86-video-cirrus-1.3.2-xorg-server-1.12.patch 1744 RMD160 5f5ae4a36dda2d43e6164b48bf2943a955b6682e SHA1 e165c77c142b993e98ac2c8e18b5431d754cf7c2 SHA256 14026823b8639afd82060d2f5b59c114ba10ae46691b557b04d0718075518095
+DIST xf86-video-cirrus-1.3.2.tar.bz2 286949 RMD160 08abaed27b66ab9e6140e34b936a6e190593d6da SHA1 85bc5833075f9ddadb902f71a40249aa769aa4d1 SHA256 529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
+DIST xf86-video-cirrus-1.4.0.tar.bz2 317013 RMD160 aade808c08eb665f9a8043537caf0580cb528a0c SHA1 3f76802415e7dc02058222a5fe44cacd9e3529dd SHA256 2b07fa5d4a86acb277d72c7ae35566ae21b08836645c6a88e7662422af5e962e
+EBUILD xf86-video-cirrus-1.3.2-r1.ebuild 602 RMD160 ed93d410ba5f1f938133dad8ae1eb775e184afbe SHA1 ad108c086c1c516c3d81fdd2dcb4b4cff5f72466 SHA256 0c971bcbc810f52d157daed90edfd6736a1dca9e60ce6315dd6ef4a38d92b457
+EBUILD xf86-video-cirrus-1.3.2.ebuild 601 RMD160 fc173b0366371ad9ae8c45fda87dfa970ee82dee SHA1 94de1f58720c91a412e6c0a56a75dd4495a2fccf SHA256 3d80543433bf66a3c8172b3660de8a6219df97004e5502a8adc7e9f67875ccc7
+EBUILD xf86-video-cirrus-1.4.0.ebuild 444 RMD160 36f38971955658169ddc7c1ab91b98b0524b5f63 SHA1 d5f350acb04963937f90f24a76463d59688f7382 SHA256 b7ad1f71c02aab7f6e2594a23f13004edebfd7f8a75655abc524e2e9e2b8ff1d
+MISC ChangeLog 6041 RMD160 9f180d3b257c08fbd632c76ef96a12915101b356 SHA1 90757f8e1846f6ed4380112daab72b19f52649d7 SHA256 8aed72dcbdab27c630bb82a870da48b6a4b386c94e8c20a876f966cc45736b1d
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-declare.patch b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-declare.patch
new file mode 100644
index 0000000..9ea84f5
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-declare.patch
@@ -0,0 +1,42 @@
+From 05fd00f46eb3be46d669921d11dff6fe8a5bb60b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@×××××.com>
+Date: Sat, 29 Oct 2011 23:58:41 +0000
+Subject: pciTag was removed from xorg-server, so provide it in-driver until this is updated to use libpciaccess
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@×××××.com>
+---
+diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h
+index f0f5cf8..fa60a19 100644
+--- a/src/cir_pcirename.h
++++ b/src/cir_pcirename.h
+@@ -34,6 +34,28 @@ enum region_type {
+     REGION_IO 
+ };
+ 
++#if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
++#define PCI_DOM_MASK    0x01fful
++#else
++#define PCI_DOM_MASK 0x0ffu
++#endif
++
++#ifndef PCI_DOM_MASK
++# define PCI_DOM_MASK 0x0ffu
++#endif
++#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu)
++
++static inline uint32_t
++pciTag(int busnum, int devnum, int funcnum)
++{
++	uint32_t tag;
++	tag  = (busnum & (PCI_DOMBUS_MASK)) << 16;
++	tag |= (devnum & 0x00001fu) << 11;
++	tag |= (funcnum & 0x000007u) << 8;
++
++	return tag;
++}
++
+ #ifndef XSERVER_LIBPCIACCESS
+ 
+ /* pciVideoPtr */
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-redefine.patch b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-redefine.patch
new file mode 100644
index 0000000..3823fdd
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-pcitag-redefine.patch
@@ -0,0 +1,35 @@
+From d9c9cc333e8a67749c20b3b30129f4d2297a3e0a Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@×××××.com>
+Date: Mon, 31 Oct 2011 03:34:47 +0000
+Subject: Build fix for older servers (error: conflicting types for 'pciTag')
+
+/usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' was here
+
+Reported-by: Johannes Obermayr <johannesobermayr@×××.de>
+Signed-off-by: Jeremy Huddleston <jeremyhu@×××××.com>
+---
+diff --git a/src/cir_pcirename.h b/src/cir_pcirename.h
+index fa60a19..669b8fe 100644
+--- a/src/cir_pcirename.h
++++ b/src/cir_pcirename.h
+@@ -34,6 +34,10 @@ enum region_type {
+     REGION_IO 
+ };
+ 
++#include "xf86Module.h"
++
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12
++
+ #if (defined(__alpha__) || defined(__ia64__)) && defined (linux)
+ #define PCI_DOM_MASK    0x01fful
+ #else
+@@ -55,6 +59,7 @@ pciTag(int busnum, int devnum, int funcnum)
+ 
+ 	return tag;
+ }
++#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 12 */
+ 
+ #ifndef XSERVER_LIBPCIACCESS
+ 
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-xorg-server-1.12.patch b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-xorg-server-1.12.patch
new file mode 100644
index 0000000..c2bf2d0
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/files/xf86-video-cirrus-1.3.2-xorg-server-1.12.patch
@@ -0,0 +1,61 @@
+From 9fcfd1aa760023e449cbb8c1eebd0bb570a6aacb Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@×××××.com>
+Date: Wed, 19 Oct 2011 07:12:15 +0000
+Subject: Build fix for ABI Version 12
+
+ABI Version 12 removes support for multiple PCI domains.  If you need to
+use this driver on a system with more than one PCI domain, you should
+either port this driver to using libpciaccess directly or stick with an
+older server.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@×××××.com>
+---
+diff --git a/src/alp_driver.c b/src/alp_driver.c
+index edcaef3..e773471 100644
+--- a/src/alp_driver.c
++++ b/src/alp_driver.c
+@@ -480,7 +480,12 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+ 	pCir = CIRPTR(pScrn);
+ 	pCir->pScrn = pScrn;
++
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ 	pCir->PIOReg = hwp->PIOOffset + 0x3CE;
++#else
++	pCir->PIOReg = 0x3CE;
++#endif
+ 
+ 	/* Get the entity, and make sure it is PCI. */
+ 	pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+diff --git a/src/cir.h b/src/cir.h
+index 64531f5..861966d 100644
+--- a/src/cir.h
++++ b/src/cir.h
+@@ -21,7 +21,7 @@ typedef struct {
+ 	CARD32			properties;
+ 	pciVideoPtr		PciInfo;
+ 	PCITAG			PciTag;
+-	IOADDRESS		PIOReg;
++	unsigned long		PIOReg;
+     union {
+ 	struct lgRec		*lg;
+ 	struct alpRec		*alp;
+diff --git a/src/lg_driver.c b/src/lg_driver.c
+index 0f9f1f6..fc864f8 100644
+--- a/src/lg_driver.c
++++ b/src/lg_driver.c
+@@ -372,7 +372,12 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+ 	pCir = CIRPTR(pScrn);
+ 	pCir->pScrn = pScrn;
++
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ 	pCir->PIOReg = hwp->PIOOffset + 0x3CE;
++#else
++	pCir->PIOReg = 0x3CE;
++#endif
+ 
+ 	/* Get the entity, and make sure it is PCI. */
+ 	pCir->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2-r1.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2-r1.ebuild
new file mode 100644
index 0000000..6b1059d
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2-r1.ebuild,v 1.1 2012/03/18 15:42:58 chithanh Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Cirrus Logic video driver"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.2-xorg-server-1.12.patch
+	"${FILESDIR}"/${PN}-1.3.2-pcitag-declare.patch
+	"${FILESDIR}"/${PN}-1.3.2-pcitag-redefine.patch
+)

diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2.ebuild
new file mode 100644
index 0000000..c4a64a0
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.3.2.ebuild,v 1.5 2009/12/15 15:32:22 armin76 Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Cirrus Logic video driver"
+KEYWORDS="alpha amd64 ia64 ppc x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild
new file mode 100644
index 0000000..6e4f921
--- /dev/null
+++ b/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-cirrus/xf86-video-cirrus-1.4.0.ebuild,v 1.4 2012/06/24 19:05:36 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Cirrus Logic video driver"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
new file mode 100644
index 0000000..1ee1157
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-dummy-0.3.4.tar.bz2 255658 RMD160 aac23243d85dc9b17447de96b7aaf5e7e5d4d504 SHA1 876ed7165ea2821bbddd73232a1ce0b79c1f14ff SHA256 7e84dff50eb3a783c0bc718a08f82f1f34583531469c98ca75a815d177871bdc
+DIST xf86-video-dummy-0.3.5.tar.bz2 274761 RMD160 e94053e75a2e314c4cc29cdbf244cd0a3d70ba84 SHA1 41cfcaec986ab13e931d260953c5a3f626fd1d2b SHA256 d5adc63543bb93b6d88008ea746303a2ab3e8b570974704926e81d882728d95f
+EBUILD xf86-video-dummy-0.3.4.ebuild 589 RMD160 71bdf6187d3b79896f73b222b0f99b47d0d4043c SHA1 c75fa4e07e46e86eb6f2a1348bb994cc31194db4 SHA256 48e3d492fac1047772d5144d7adbc61529c8b5cf9efcd36104d24283536c17ed
+EBUILD xf86-video-dummy-0.3.5.ebuild 605 RMD160 b9791f7a54b946febade4fbb662280315a8dae40 SHA1 21940de90785a7bacc0c637e025f0f2d58391e05 SHA256 df32eba4b4dc998f4c8eb629a0bd145a174637394cfaa2f1a92654a5e762568e
+MISC ChangeLog 9567 RMD160 ef783800f2811a2962c1be9cd029fd3d2a6835cb SHA1 baafdf55dfd96dc434dfb390f1324b2179212fa5 SHA256 188487fa5d661d18989019b1b1cc2d3b2501bfc800c24c4b278e00b1fbc7c98b
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild
new file mode 100644
index 0000000..8432b01
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild,v 1.8 2011/02/14 23:56:24 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for dummy cards"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xf86dgaproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild
new file mode 100644
index 0000000..b54a48b
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5.ebuild,v 1.6 2012/06/29 04:20:22 maekke Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for dummy cards"
+
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="dga"
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	dga? (
+		x11-proto/xf86dgaproto
+	)"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dga)
+	)
+	xorg-2_pkg_setup
+}

diff --git a/x11-drivers/xf86-video-geode/Manifest b/x11-drivers/xf86-video-geode/Manifest
new file mode 100644
index 0000000..0ac73e5
--- /dev/null
+++ b/x11-drivers/xf86-video-geode/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-geode-2.11.12.tar.bz2 619964 RMD160 772834289e4649c1a5c1e52d9a6f4b26a875d7aa SHA1 2685b1775656b4195ff7c41f2f437aef62afdb28 SHA256 28d845d727d99bfa4d4b93c5486ec01b72eb222e0910a766089db1103b1c2d92
+DIST xf86-video-geode-2.11.13.tar.bz2 648657 RMD160 12f3fd498ee0afc3064f3c30f3b76974ee49b94f SHA1 0e5e9952de93c024e92b57bfb9e7078f9e163a29 SHA256 c320a2a314fc6c7a5d2dfb6a52c8fec23ab8f1b99c689ca618f02c279a64e226
+EBUILD xf86-video-geode-2.11.12.ebuild 529 RMD160 3fc3fdad7e504f901dde08d4a8a3de5b5d47cc43 SHA1 9d3546eaa75383b59fe7e1f281c4c6dcdf3929f6 SHA256 654392943f5a2b678a0deccb1561d1b1def0ac29d5ccd2e2bcbb92a867c6e453
+EBUILD xf86-video-geode-2.11.13.ebuild 534 RMD160 5f38e4b950829c4de2f1ba58cd089e109bf22802 SHA1 9ee4df05303b9621d4c5fa6f0d8e9de9160cfba6 SHA256 e0f41aeb3a79e72443412c9db35626c4a736311e5b17ec7751a1ceb5c350274b
+MISC ChangeLog 3196 RMD160 bb184fbade8ed3d699a503deea4593ceac5d8f6c SHA1 6ed4cd5d6ff3ee46226fa78755c01f15d1ee0830 SHA256 1bbf0c40a4f4a2c5d7bb7256fcc8af0feef2b02176c80735c0bbc1490d70fc04
+MISC metadata.xml 389 RMD160 7a2cd4d507f7fe3c62d631ec5936adac0d3978f1 SHA1 a937b67c534771eb6c007eba1d006fa053be31c6 SHA256 e51dede7b10a0888e7e3101632c9f3880f143347eaae6f91f5571eb6f6110086

diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.12.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.12.ebuild
new file mode 100644
index 0000000..ca59cf4
--- /dev/null
+++ b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.12.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.12.ebuild,v 1.2 2011/03/26 10:41:25 fauli Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="AMD Geode GX and LX video driver"
+
+KEYWORDS="x86"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.5"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	>=x11-proto/randrproto-1.2
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.13.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.13.ebuild
new file mode 100644
index 0000000..ab03dcd
--- /dev/null
+++ b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.13.ebuild,v 1.1 2012/01/01 16:27:52 chithanh Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="AMD Geode GX and LX video driver"
+
+KEYWORDS="~x86"
+IUSE="ztv"
+
+RDEPEND=">=x11-base/xorg-server-1.5"
+DEPEND="${RDEPEND}
+	ztv? (
+		sys-kernel/linux-headers
+	)"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ztv)
+	)
+	xorg-2_pkg_setup
+}

diff --git a/x11-drivers/xf86-video-glint/Manifest b/x11-drivers/xf86-video-glint/Manifest
new file mode 100644
index 0000000..2c1bb3f
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/Manifest
@@ -0,0 +1,8 @@
+DIST xf86-video-glint-1.2.5.tar.bz2 394136 RMD160 daf22cfda8e4c9e0b248c6b937aa2c5b32ddd82e SHA1 28d54093c6485bf0055fa16be3d116f9107aaea7 SHA256 5675f2732ab7b099a568ef4e5c7bb0d0e1bb4b0eb4d19133dc1b2225fd9c814b
+DIST xf86-video-glint-1.2.6.tar.bz2 393872 RMD160 787a62d91666262f3f5aea3796605147f3b51bd1 SHA1 ae29f41570915b71de0d964398073a19ec14bc15 SHA256 d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7
+DIST xf86-video-glint-1.2.7.tar.bz2 397381 RMD160 ce2b5b8407c78805af5d034316e436997adfc1c6 SHA1 2d760568e21327461e0aecf5bc201bd6c2cec47e SHA256 9aa9689436fc78a71145d4caeaf63b0e80f9abd54e9b4a3066f62ee5b334c359
+EBUILD xf86-video-glint-1.2.5.ebuild 721 RMD160 4fcfbaa59547a5138ff94ea725f3dde9c93943e8 SHA1 0e463fe78e0e9c002df4815db5d9f6e7ad0a9f7a SHA256 dad5edc4454b59e54ce06f1cec31599a2e5cc0e5fbd8bb7c6d47a26e016b3b81
+EBUILD xf86-video-glint-1.2.6.ebuild 526 RMD160 bde4e642e6d0b667fcf84f3ea96d3614033e0689 SHA1 406c444d73bd2b2c6061a0ce0058d991f0f41615 SHA256 338630657b1301ad0ec8416bae6302351903ae2f8ad60fce6b6bc35da6ffc960
+EBUILD xf86-video-glint-1.2.7.ebuild 538 RMD160 7fe657b5174572a4919904024b47bc8d3fae6398 SHA1 edfceed12de784da220fa82ebb03737858567962 SHA256 555180b581cf32a8ffca0303f9b48214166819cd37f085d81e20fba59786eb91
+MISC ChangeLog 8305 RMD160 5785a9a2678db074e50f0027750584f73c68f10a SHA1 f49e90bfa439228e111baee4fe3aac130edb1db6 SHA256 bfecf6d0d05306c5c282e98f012cf8fcd5cfc33edd3a218076a5fb1a24a5d9cd
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild
new file mode 100644
index 0000000..7cee2f4
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild,v 1.5 2011/02/14 23:56:23 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="GLINT/Permedia video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2
+			x11-proto/glproto )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.6.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.6.ebuild
new file mode 100644
index 0000000..c82db07
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.6.ebuild,v 1.5 2012/02/19 15:00:46 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="GLINT/Permedia video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild
new file mode 100644
index 0000000..87fe1a0
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.7.ebuild,v 1.4 2012/06/24 19:06:42 ago Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="GLINT/Permedia video driver"
+
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-i128/Manifest b/x11-drivers/xf86-video-i128/Manifest
new file mode 100644
index 0000000..68bb530
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-i128-1.3.4.tar.bz2 292046 RMD160 b8d1d9d6d8991367790506a4ea754206ed308a61 SHA1 d5f755dc964eaa067b4efcafafd00814a60df775 SHA256 b69b13a7fd69f5ad35119b6f8efb3243bfea05ae9aa5a067d0e754de5d248bcf
+DIST xf86-video-i128-1.3.5.tar.bz2 306803 RMD160 e09c18100cd9b9877d80dd4e97b4e62f2483ae63 SHA1 2cf01b15fc3b5f2588627f051f9ae4d892696854 SHA256 3eedeb1e575e96b2ebebdf894c515e8543900aa3f9f85d10120b8240264333ea
+EBUILD xf86-video-i128-1.3.4.ebuild 539 RMD160 f98a3ba5263ed17031ee58ef207e2b8f21072bf8 SHA1 4841bc538fcfb94a5033998b910432216b43badd SHA256 be8c1f8f5a0d76ce0d9b6d4f10f17709f03293e68c8c70d4e692e85ab2c37055
+EBUILD xf86-video-i128-1.3.5.ebuild 431 RMD160 d86282e7afe57b56f9aa1c38da62d43eb15cb2b7 SHA1 217802934364aba02e5b88f102b3d2ff2ad05f7f SHA256 7a2d64618fee14f46fc6e5241a0389c741c1a808d6998d8703563416846c0a44
+MISC ChangeLog 6630 RMD160 8615faab2cc520593c56c14034bdfbd774215c49 SHA1 d67c2ec6d0cf46197d413189df4abf036973df29 SHA256 0b516b228bd285e779ab043a955f8e9ae6ac2a2d806a919611388e1805476eaa
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.4.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.4.ebuild
new file mode 100644
index 0000000..175ff42
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.4.ebuild,v 1.4 2011/02/12 19:23:18 armin76 Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Number 9 I128 video driver"
+
+KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild
new file mode 100644
index 0000000..11ffa45
--- /dev/null
+++ b/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i128/xf86-video-i128-1.3.5.ebuild,v 1.4 2012/06/24 19:07:08 ago Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Number 9 I128 video driver"
+
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-i740/Manifest b/x11-drivers/xf86-video-i740/Manifest
new file mode 100644
index 0000000..e30ea5f
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-i740-1.3.2.tar.bz2 273853 RMD160 71db34271badf1febbc5b4ff78e3fea913a2599a SHA1 aadd2168153f780c487778e5fdda5473ed4b243d SHA256 48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
+DIST xf86-video-i740-1.3.3.tar.bz2 316716 RMD160 c17a3c2883e14110208a2272f8b2ba2b469f62fb SHA1 885660aad0d558ae0fb69f3b639c03f084a7a615 SHA256 a39e8cf8e34816d07d33eae79dcb26fc2137f719156ae90fa4afff319e320dcc
+EBUILD xf86-video-i740-1.3.2.ebuild 585 RMD160 7b1d3253a0632b3eed16cd6209ce5a30d79a11dd SHA1 7ad6df64a98986e03d4bf792e7c7b27051c718f6 SHA256 8a1a2e30a7c1190eb9620eb116e5a51972700ea79e66a50e859a8822e3cfc40d
+EBUILD xf86-video-i740-1.3.3.ebuild 427 RMD160 8c705770e38c70b22f488458b627c0e151a40aec SHA1 27869bcec48bb61d0646d7b691ef6f1a6bb90d8f SHA256 954231090f01e58bf5ec3ba37fa1e40ca85fe7347b356253061b06afd81ee999
+MISC ChangeLog 5020 RMD160 a4b94a03f9b84ffc0b4a9e6ec05c5aeadd405595 SHA1 52e8c873b49df18156916b822adc500ca4721908 SHA256 a140ba795fd14980afbee36e6ae7d64fed4c664bcc8f241b6019a4ef8771e404
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild
new file mode 100644
index 0000000..1be87c7
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild,v 1.4 2009/12/15 15:35:45 armin76 Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="Intel i740 video driver"
+KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild
new file mode 100644
index 0000000..adda13b
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.3.ebuild,v 1.4 2012/06/24 19:07:34 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Intel i740 video driver"
+
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
new file mode 100644
index 0000000..e3d546b
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -0,0 +1,29 @@
+AUX 2.10.0-0001-Extract-pixel-value-for-all-formats-to-avoid-hitting.patch 3943 RMD160 edfc2294341ff7c314e87e82ec95ceff920585ca SHA1 b1c9bcfe6b48a0f7426fbdb3c862a121f81a58e7 SHA256 53694b0c147834067b90be1508e96f67d290de595516361c98af069ae6cd9113
+AUX xf86-video-intel-2.15-batch-overrun.patch 882 RMD160 203f4f92a7bffef0f900ccc8f5c81cd69a975dcb SHA1 fc3f100a57dc52c06b7f2109aba774bb3abcef93 SHA256 5044689aaefa4c3416c8e8d70d0765b8b149a8352b3992cb405d3a280d9f495f
+AUX xf86-video-intel-2.15-unsigned-promotion.patch 1207 RMD160 19b3eb510411d1c0d70df793b7d1525828c4035d SHA1 5505becb9bea0391d6441aa070ade16dc01f48d8 SHA256 c61713af565c8ce55d4c00dbfe24380ed6952698df1bf3070813db953b979102
+AUX xf86-video-intel-2.17-sna-offsets.patch 1062 RMD160 23f2a6038b00421d5d88433e69cd5af47731fd9b SHA1 268d7801436cac6921d016d4c755a8670a9f31ba SHA256 26ad750c57220a11875ebf4bb1665cf748c9da12af9c0eade12609559de06041
+AUX xf86-video-intel-2.17-sna-pipeline-flush.patch 1634 RMD160 a6ca8155a72594119c0479857eb782cc0082833c SHA1 9563853e00bc0bd1c3425e34c24d74c07ab430d4 SHA256 c9605db58f8a2849061b837807bf30bb85a021ea98de2976aefa8bb533d8106e
+DIST xf86-video-intel-2.10.0.tar.bz2 885299 RMD160 e37d47758231d61d99fa65873884727b44623c33 SHA1 1683eddf89ed88f109cb2fe46284e3f8f304a0d9 SHA256 e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab
+DIST xf86-video-intel-2.11.0.tar.bz2 871551 RMD160 a857942e7eacd9e7c517c485fb6e400103e238f3 SHA1 f25eb8619ac7c107fdcee525388a8a03dd62719b SHA256 db292cbc25f3b132357795697a61c5ec6f08cb041a2cb6fd081298306f4f5a4f
+DIST xf86-video-intel-2.13.0.tar.bz2 917026 RMD160 565c3b58938ac392d7a4322ba51aabdc9e229606 SHA1 1b2aebd444bcfc371a55af8910eb4d5928eab5c9 SHA256 d8b2fae8d0c4ae372994cb7df8de8aa995b8e89b1bc5766c53ea0751752fc887
+DIST xf86-video-intel-2.14.0.tar.bz2 929063 RMD160 c0c5991d824f3989df3846fac78bbbfb5f1d0fc9 SHA1 103193a01b9c29d6f71a620ad99c6e1495276e68 SHA256 e18c37a579a960516e69de5c6f74750ca02208c0e41cf763ae5630c84db507df
+DIST xf86-video-intel-2.15.0.tar.bz2 964756 RMD160 e99cfdf7a3b6ff80c2f42fa4d98e735f6eea1238 SHA1 78ec39a4470cfc0bf13d269fb915f6c5a498ee62 SHA256 c377e1e9ab8b846d7e039acc9105479d5dce6a03f1ddccccf01c8474259c1720
+DIST xf86-video-intel-2.16.0.tar.bz2 1249069 RMD160 9eb9aeabecfbe9f6dde6c81a59c07d9d90f2dc69 SHA1 53441ea4d4335b501d32809b6b92593cbb1f79cf SHA256 77482bcd1e30a57b68ba0d6a1862b4ff3c55fa23bf0109ec2af318a3e066ebfe
+DIST xf86-video-intel-2.17.0.tar.bz2 1339717 RMD160 898b6bd7fcfd0223113304a6a658dbea2c19b00a SHA1 04ad9fa1f4c4e0a90f48752a709bf14700c864af SHA256 8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387
+DIST xf86-video-intel-2.18.0.tar.bz2 1424467 RMD160 7e6dc57ce918ff8ba7121705ff3737ee832ed527 SHA1 77fae98e73414140bf214dca5da32bcf079c4463 SHA256 dce63e33ccfada39ef1e1e6768dfd8edd4c525670dfe56d1c42b2f9570039ffc
+DIST xf86-video-intel-2.19.0.tar.bz2 1463260 RMD160 df7a6797cc74af57c751905e3ce65be35de43e5c SHA1 131934cf5e90bd48c883804cc644c4cb8b1de100 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc
+DIST xf86-video-intel-2.8.1.tar.bz2 748928 RMD160 9416290dcbc7631f165a3378bf7aa189a1dea880 SHA1 76ae4c8fbd14a7a16e3f8dc2f2588947635db2bc SHA256 c6778fc7e43c701d5829514329ee70f5dc539ff8f5b3c79587577b617a535c81
+DIST xf86-video-intel-2.9.1.tar.bz2 789001 RMD160 2ccac37af91ec10973c9dc22adc9f172a8ac057a SHA1 ca5887df67ec46f27eeeaf8158048d6500333ccf SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76
+EBUILD xf86-video-intel-2.10.0-r1.ebuild 1543 RMD160 34dd25e7b800cd8aceee91598813cb99219a4eb4 SHA1 eb79c178b9451c43040af0d2fa73894780c36464 SHA256 e010c06645cadfb5864ba68fbf638ee1e9f09163d38173a69638a1f69dbeaafe
+EBUILD xf86-video-intel-2.11.0.ebuild 1410 RMD160 a8a34e872eaf5a395771a120cbb4297654cb3b93 SHA1 77be27bd5a01476fe15b79d4118fec197100dac5 SHA256 48b2a4df3838c17b6f7fa8ad85f2bc70251d5ce5bb67f6b6494296a79a4964b0
+EBUILD xf86-video-intel-2.13.0.ebuild 1385 RMD160 a4acf7e6ef84163bcab69e0c70c00e7eb4ff141b SHA1 2ad6974791de11bbf29aa339cfe4761bc1379ba4 SHA256 aeb1c0146a0a8f57baa40250030ba595d8cad970044b3c6f8be9626e76a36b77
+EBUILD xf86-video-intel-2.14.0.ebuild 1385 RMD160 431aa76af71479f20bf4111cb2ad79e2d7348296 SHA1 ce4fa6953bbf2c18ab683e169527e9adacbfbd48 SHA256 0a6de74e49b24b7797cca546f2e5454ba7840b1306f8d6456544bf4909f6ca3c
+EBUILD xf86-video-intel-2.15.0-r1.ebuild 1306 RMD160 52f70fce11344ff251f6dc7b6031915031a666ab SHA1 b83a869878163a018ae1d4d238cf1e5e587feea0 SHA256 a364e58511fcd4e71d684c1f6c7196d6724d480fea2d8d43d5d1d7959a32bc86
+EBUILD xf86-video-intel-2.16.0.ebuild 1266 RMD160 f767d2da943c54565fb64b2e3b23c0a0afec8a86 SHA1 fe0f6d0f72a8c56056d6390559afe6f980ab784b SHA256 3cca994e228725c2a7e0c4f0e8fd0889e48fb0a7211c722840bc82fa5541a363
+EBUILD xf86-video-intel-2.17.0-r3.ebuild 1437 RMD160 5acf5e351efb4109b15157a5e377ca81df5047ad SHA1 65d7809a39c67c77448af5f6a2d7c9c5c37b1eaf SHA256 977b0301357da9207a0b5e121792d55e12e554c790eed9ce52de62986f4464f3
+EBUILD xf86-video-intel-2.18.0.ebuild 1291 RMD160 e747e5c78d50f328c245b5586c59654b87221d1f SHA1 ab6db44a8b883d0c4a5b4a0dd307a88b820d611c SHA256 483a3b6850ab0aadacb4ed86b123f43ad9fc1c54828e4695e6f7b5cf2ccc9fd1
+EBUILD xf86-video-intel-2.19.0.ebuild 1363 RMD160 94eadb197da58bfb04a70138fab47e5338b36bd1 SHA1 989b2846da0d3c6796dd81a162f212a4594d0f01 SHA256 7128d5a83bc3fe0b71e3d7a74c1e5a120a35296d1ecf320b22a651781e293e5d
+EBUILD xf86-video-intel-2.8.1.ebuild 794 RMD160 930d426a13e53d243c70df156e27923586b2502b SHA1 33fb66dc8fda63b7057037c84645b23feeecad2d SHA256 d012b3c43258b9e5e06d56e1d4aec2711644443eb927e800f9525bdc9610bf2f
+EBUILD xf86-video-intel-2.9.1.ebuild 776 RMD160 feac2b322d6a93f93fa155a0a148353b7675d5b5 SHA1 9b9a418d2da61de513cb3fec0c47b081f9318079 SHA256 7093496b4a55550f1f2a11b0f405be716f5da354947ff7380a052e4fd6954129
+MISC ChangeLog 45835 RMD160 d873f6ebb20d073c7f2ad41a4392b273b57eab89 SHA1 772302c42891a96273bf1f4c8b0117eca1785052 SHA256 3fc2a6b2033c56a540335a0b71091a0f5d725cc852eeee0d7b1b12e321c76e0f
+MISC metadata.xml 348 RMD160 e6f4b2613ac47643dcfdcf2a86eeff8eb3214626 SHA1 18cdf7cab63aea5f1def12502f61a007fdf193d7 SHA256 fa82cf175b029cd8bb6b1376ff254d6505a9dccb779a7a3a94086c91a64aa5bc

diff --git a/x11-drivers/xf86-video-intel/files/2.10.0-0001-Extract-pixel-value-for-all-formats-to-avoid-hitting.patch b/x11-drivers/xf86-video-intel/files/2.10.0-0001-Extract-pixel-value-for-all-formats-to-avoid-hitting.patch
new file mode 100644
index 0000000..27f6fd7
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.10.0-0001-Extract-pixel-value-for-all-formats-to-avoid-hitting.patch
@@ -0,0 +1,140 @@
+From 6fd45abb31807dea0b9ebe708d840b1369353a8c Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@×××××××××××××××.uk>
+Date: Mon, 25 Jan 2010 15:15:04 +0000
+Subject: [PATCH 1/1] Extract pixel value for all formats to avoid hitting fallbacks.
+
+On failing to extract the pixel value for an alpha-only solid we
+actually triggered a fallback. Since this path is commonly hitting
+whilst fading in images, for example cairo_paint_with_alpha(), the
+fallback was detected during the Moblin boot sequence where it was
+adding a second to the overall boot time.
+
+See
+  fallback intel: Moblin startup is hitting a composite fallback, costing
+                  a ton of performance
+  https://bugs.freedesktop.org/show_bug.cgi?id=26189
+
+Based on the initial patch by Arjan van de Van.
+
+Signed-off-by: Chris Wilson <chris@×××××××××××××××.uk>
+(cherry picked from commit 197cb08a2d54cabbfe97454d7db85cfe1f5f27ba)
+---
+ uxa/uxa-render.c |   64 ++++++++++++++++++++++++++++++++---------------------
+ 1 files changed, 39 insertions(+), 25 deletions(-)
+
+diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
+index 525f75b..52ebb62 100644
+--- a/uxa/uxa-render.c
++++ b/uxa/uxa-render.c
+@@ -138,11 +138,6 @@ uxa_get_pixel_from_rgba(CARD32 * pixel,
+ 	int rbits, bbits, gbits, abits;
+ 	int rshift, bshift, gshift, ashift;
+ 
+-	*pixel = 0;
+-
+-	if (!PICT_FORMAT_COLOR(format))
+-		return FALSE;
+-
+ 	rbits = PICT_FORMAT_R(format);
+ 	gbits = PICT_FORMAT_G(format);
+ 	bbits = PICT_FORMAT_B(format);
+@@ -150,6 +145,14 @@ uxa_get_pixel_from_rgba(CARD32 * pixel,
+ 	if (abits == 0)
+ 	    abits = PICT_FORMAT_BPP(format) - (rbits+gbits+bbits);
+ 
++	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_A) {
++		*pixel = alpha >> (16 - abits);
++		return TRUE;
++	}
++
++	if (!PICT_FORMAT_COLOR(format))
++		return FALSE;
++
+ 	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
+ 		bshift = 0;
+ 		gshift = bbits;
+@@ -162,6 +165,7 @@ uxa_get_pixel_from_rgba(CARD32 * pixel,
+ 		ashift = bshift + bbits;
+ 	}
+ 
++	*pixel = 0;
+ 	*pixel |= (blue >> (16 - bbits)) << bshift;
+ 	*pixel |= (red >> (16 - rbits)) << rshift;
+ 	*pixel |= (green >> (16 - gbits)) << gshift;
+@@ -179,43 +183,53 @@ uxa_get_rgba_from_pixel(CARD32 pixel,
+ 	int rbits, bbits, gbits, abits;
+ 	int rshift, bshift, gshift, ashift;
+ 
+-	if (!PICT_FORMAT_COLOR(format))
+-		return FALSE;
+-
+ 	rbits = PICT_FORMAT_R(format);
+ 	gbits = PICT_FORMAT_G(format);
+ 	bbits = PICT_FORMAT_B(format);
+ 	abits = PICT_FORMAT_A(format);
+ 
+-	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
++	if (PICT_FORMAT_TYPE(format) == PICT_TYPE_A) {
++		rshift = gshift = bshift = ashift = 0;
++        } else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ARGB) {
+ 		bshift = 0;
+ 		gshift = bbits;
+ 		rshift = gshift + gbits;
+ 		ashift = rshift + rbits;
+-	} else {		/* PICT_TYPE_ABGR */
++        } else if (PICT_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
+ 		rshift = 0;
+ 		gshift = rbits;
+ 		bshift = gshift + gbits;
+ 		ashift = bshift + bbits;
++	} else {
++		return FALSE;
+ 	}
+ 
+-	*red = ((pixel >> rshift) & ((1 << rbits) - 1)) << (16 - rbits);
+-	while (rbits < 16) {
+-		*red |= *red >> rbits;
+-		rbits <<= 1;
+-	}
++	if (rbits) {
++		*red = ((pixel >> rshift) & ((1 << rbits) - 1)) << (16 - rbits);
++		while (rbits < 16) {
++			*red |= *red >> rbits;
++			rbits <<= 1;
++		}
++	} else
++		*red = 0;
+ 
+-	*green = ((pixel >> gshift) & ((1 << gbits) - 1)) << (16 - gbits);
+-	while (gbits < 16) {
+-		*green |= *green >> gbits;
+-		gbits <<= 1;
+-	}
++	if (gbits) {
++		*green = ((pixel >> gshift) & ((1 << gbits) - 1)) << (16 - gbits);
++		while (gbits < 16) {
++			*green |= *green >> gbits;
++			gbits <<= 1;
++		}
++	} else
++		*green = 0;
+ 
+-	*blue = ((pixel >> bshift) & ((1 << bbits) - 1)) << (16 - bbits);
+-	while (bbits < 16) {
+-		*blue |= *blue >> bbits;
+-		bbits <<= 1;
+-	}
++	if (bbits) {
++		*blue = ((pixel >> bshift) & ((1 << bbits) - 1)) << (16 - bbits);
++		while (bbits < 16) {
++			*blue |= *blue >> bbits;
++			bbits <<= 1;
++		}
++	} else
++		*blue = 0;
+ 
+ 	if (abits) {
+ 		*alpha =
+-- 
+1.7.0.2
+

diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch
new file mode 100644
index 0000000..fe2aa2d
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-batch-overrun.patch
@@ -0,0 +1,26 @@
+From c9fb69cb2502917dfb2828c90802de7766072899 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@×××××××××××××××.uk>
+Date: Sun, 17 Apr 2011 09:42:05 +0000
+Subject: i965/video: We need 150 dwords of space for video state emission
+
+(Actually around 131, with additional 10% just for safety.)
+
+Reported-by: Modestas Vainius <geromanas@××××××.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36319
+Signed-off-by: Chris Wilson <chris@×××××××××××××××.uk>
+---
+diff --git a/src/i965_video.c b/src/i965_video.c
+index c757681..53a9394 100644
+--- a/src/i965_video.c
++++ b/src/i965_video.c
+@@ -1210,7 +1210,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn,
+ 			intel_batch_submit(scrn);
+ 		}
+ 
+-		intel_batch_start_atomic(scrn, 100);
++		intel_batch_start_atomic(scrn, 150);
+ 
+ 		i965_emit_video_setup(scrn, surface_state_binding_table_bo, n_src_surf, pixmap);
+ 
+--
+cgit v0.8.3-6-g21f6

diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch
new file mode 100644
index 0000000..d99b669
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.15-unsigned-promotion.patch
@@ -0,0 +1,32 @@
+From a51cd83d25f2f9f2107219d5671194f931601244 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@×××××××××××××××.uk>
+Date: Sun, 17 Apr 2011 09:36:26 +0000
+Subject: intel: Beware the unsigned promotion when checking for batch overflows
+
+Reported-by: Modestas Vainius <geromanas@××××××.com>
+References: https://bugs.freedesktop.org/show_bug.cgi?id=36319
+Signed-off-by: Chris Wilson <chris@×××××××××××××××.uk>
+---
+diff --git a/src/intel_batchbuffer.h b/src/intel_batchbuffer.h
+index 605932a..2403a38 100644
+--- a/src/intel_batchbuffer.h
++++ b/src/intel_batchbuffer.h
+@@ -50,14 +50,14 @@ static inline int intel_vertex_space(intel_screen_private *intel)
+ }
+ 
+ static inline void
+-intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, unsigned int sz)
++intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, int sz)
+ {
+ 	assert(sz < intel->batch_bo->size - 8);
+ 	if (intel_batch_space(intel) < sz)
+ 		intel_batch_submit(scrn);
+ }
+ 
+-static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, unsigned int sz)
++static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, int sz)
+ {
+ 	intel_screen_private *intel = intel_get_screen_private(scrn);
+ 
+--
+cgit v0.8.3-6-g21f6

diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch
new file mode 100644
index 0000000..1e4ec4c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-offsets.patch
@@ -0,0 +1,31 @@
+From 16f5e224dcfd97012b38ee1af6c72dbe3c0f3304 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@×××××××××××××××.uk>
+Date: Fri, 25 Nov 2011 16:21:41 +0000
+Subject: sna: Avoid the double application of drawable offsets for tiled spans
+
+As we handle tiled spans indirectly, we need to avoid applying the
+drawable offsets twice (once in the mi layer generating the spans, and
+then once more in the tiled rect renderer).
+
+Reported-by: Ulrich Müller <ulm@g.o>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43245
+Signed-off-by: Chris Wilson <chris@×××××××××××××××.uk>
+---
+diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
+index 1a35c4d..03020c9 100644
+--- a/src/sna/sna_accel.c
++++ b/src/sna/sna_accel.c
+@@ -2790,9 +2790,9 @@ sna_fill_spans(DrawablePtr drawable, GCPtr gc, int n,
+ 				return;
+ 
+ 			for (i = 0; i < n; i++) {
+-				rect[i].x = pt[i].x;
++				rect[i].x = pt[i].x - drawable->x;
+ 				rect[i].width = width[i];
+-				rect[i].y = pt[i].y;
++				rect[i].y = pt[i].y - drawable->y;
+ 				rect[i].height = 1;
+ 			}
+ 
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-pipeline-flush.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-pipeline-flush.patch
new file mode 100644
index 0000000..d1f7e75
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.17-sna-pipeline-flush.patch
@@ -0,0 +1,48 @@
+From a5353a7c1d1f02b887f61f543c8e4bd4e8bd104f Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@×××××××××××××××.uk>
+Date: Mon, 21 Nov 2011 10:58:17 +0000
+Subject: sna/gen4: Use the special composite rect emission for fill_one()
+
+In order to workaround a bug in the shaders on gen4, we need to flush
+the pipeline after every rectangle. The recently introduced fill-one
+mechanism for gen4, missed this vital step triggering a random hang with
+an otherwise sane batchbuffer (the missing flush is hard to spot!).
+
+Fixes regression from 86f99379ee5 (sna/gen4: Add fill-one).
+
+Reported-by: Albert Damen <albrt@×××.net>
+Reported-by: Fryderyk Dziarmagowski <fdziarmagowski@×××××.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43083
+Signed-off-by: Chris Wilson <chris@×××××××××××××××.uk>
+---
+diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
+index c0a32a4..dbb7c43 100644
+--- a/src/sna/gen4_render.c
++++ b/src/sna/gen4_render.c
+@@ -2662,23 +2662,7 @@ gen4_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo,
+ 	gen4_fill_bind_surfaces(sna, &tmp);
+ 	gen4_align_vertex(sna, &tmp);
+ 
+-	if (!gen4_get_rectangles(sna, &tmp, 1)) {
+-		gen4_fill_bind_surfaces(sna, &tmp);
+-		gen4_get_rectangles(sna, &tmp, 1);
+-	}
+-
+-	DBG(("	(%d, %d), (%d, %d)\n", x1, y1, x2, y2));
+-	OUT_VERTEX(x2, y2);
+-	OUT_VERTEX_F(1);
+-	OUT_VERTEX_F(1);
+-
+-	OUT_VERTEX(x1, y2);
+-	OUT_VERTEX_F(0);
+-	OUT_VERTEX_F(1);
+-
+-	OUT_VERTEX(x1, y1);
+-	OUT_VERTEX_F(0);
+-	OUT_VERTEX_F(0);
++	gen4_render_fill_rectangle(sna, &tmp, x1, y1, x2 - x1, y2 - y1);
+ 
+ 	gen4_vertex_flush(sna);
+ 	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.10.0-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.10.0-r1.ebuild
new file mode 100644
index 0000000..3e7e5b4
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.10.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.10.0-r1.ebuild,v 1.5 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI=3
+
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~ia64 ~x86 -x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.6
+	|| ( <x11-libs/libdrm-2.4.22 x11-libs/libdrm[video_cards_intel] )
+	x11-libs/libpciaccess
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-1.99.3
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+	       x11-proto/glproto )"
+
+PATCHES=(
+"${FILESDIR}/2.10.0-0001-Extract-pixel-value-for-all-formats-to-avoid-hitting.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="$(use_enable dri) --enable-xvmc"
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present CONFIG_DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.11.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.11.0.ebuild
new file mode 100644
index 0000000..ac1f4a6
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.11.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.11.0.ebuild,v 1.4 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI=3
+
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~ia64 ~x86 -x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.6
+	|| ( <x11-libs/libdrm-2.4.22 x11-libs/libdrm[video_cards_intel] )
+	x11-libs/libpciaccess
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-1.99.3
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+	       x11-proto/glproto )"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="$(use_enable dri) --enable-xvmc"
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.13.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.13.0.ebuild
new file mode 100644
index 0000000..335e829
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.13.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.13.0.ebuild,v 1.5 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI=3
+
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="amd64 ia64 x86 -x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.6
+	>=x11-libs/libdrm-2.4.22[video_cards_intel]
+	x11-libs/libpciaccess
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-1.99.3
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+	       x11-proto/glproto )"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="$(use_enable dri) --enable-xvmc"
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.14.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.14.0.ebuild
new file mode 100644
index 0000000..ca78886
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.14.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.14.0.ebuild,v 1.6 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI=3
+
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="amd64 ia64 x86 -x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.6
+	>=x11-libs/libdrm-2.4.23[video_cards_intel]
+	x11-libs/libpciaccess
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-1.99.3
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+	       x11-proto/glproto )"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="$(use_enable dri) --enable-xvmc"
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.0-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.0-r1.ebuild
new file mode 100644
index 0000000..d13f1d9
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.15.0-r1.ebuild,v 1.6 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="amd64 ia64 x86 -x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libdrm-2.4.23[video_cards_intel]
+	>=x11-libs/libxcb-1.5"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/xf86-video-intel-2.15-batch-overrun.patch"
+	"${FILESDIR}/xf86-video-intel-2.15-unsigned-promotion.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		--enable-xvmc
+	)
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0.ebuild
new file mode 100644
index 0000000..7534c18
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.16.0.ebuild,v 1.2 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~ia64 ~x86 -x86-fbsd"
+IUSE="sna"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5
+	>=x11-libs/libdrm-2.4.23[video_cards_intel]
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		$(use_enable sna)
+		--enable-xvmc
+	)
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r3.ebuild
new file mode 100644
index 0000000..6804d82
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.17.0-r3.ebuild,v 1.5 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="amd64 ia64 x86 -x86-fbsd"
+IUSE="sna"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5
+	>=x11-libs/libdrm-2.4.23[video_cards_intel]
+	sna? (
+		>=x11-base/xorg-server-1.10
+		>=x11-libs/pixman-0.23
+	)"
+# Requires dri2proto-2.6 (unreleased)
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17-sna-offsets.patch
+	"${FILESDIR}"/${PN}-2.17-sna-pipeline-flush.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		$(use_enable sna)
+		--enable-xvmc
+	)
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild
new file mode 100644
index 0000000..6d9a072
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.18.0.ebuild,v 1.3 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~ia64 ~x86 -x86-fbsd"
+IUSE="sna"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	sna? (
+		>=x11-base/xorg-server-1.10
+		>=x11-libs/pixman-0.24
+	)"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		$(use_enable sna)
+		--enable-xvmc
+	)
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
new file mode 100644
index 0000000..12bac3e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.6 2012/06/26 00:08:06 robbat2 Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd -x86-fbsd"
+IUSE="glamor sna"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	glamor? (
+		x11-libs/glamor
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+		>=x11-libs/pixman-0.24
+	)"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		$(use_enable glamor)
+		$(use_enable sna)
+		--enable-xvmc
+	)
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.8.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.8.1.ebuild
new file mode 100644
index 0000000..4a57c6e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.8.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.8.1.ebuild,v 1.6 2012/06/03 12:38:27 chithanh Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.6
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-1.99.3
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xineramaproto
+	x11-proto/glproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2.4.11
+			x11-libs/libX11 )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.1.ebuild
new file mode 100644
index 0000000..f8531d3
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.9.1.ebuild,v 1.6 2012/06/03 12:38:27 chithanh Exp $
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.6
+	<x11-libs/libdrm-2.4.21
+	x11-libs/libpciaccess
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-1.99.3
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xineramaproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+	       x11-proto/glproto )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-ivtv/Manifest b/x11-drivers/xf86-video-ivtv/Manifest
new file mode 100644
index 0000000..2fb9db6
--- /dev/null
+++ b/x11-drivers/xf86-video-ivtv/Manifest
@@ -0,0 +1,4 @@
+DIST xf86-video-ivtv-1.1.2.tar.gz 303046 RMD160 1f29d882aa56e0d393d5a4cfa62337783212a4f0 SHA1 51b573d3f0256af8b93c6d03706ad9bd4df19166 SHA256 863f449ec9dc9b2a2a15c8305660267a3365c72fa2e805d1e311dddf2791c938
+EBUILD xf86-video-ivtv-1.1.2.ebuild 453 RMD160 d622d93dfa78bde092221096c476fdd61d965585 SHA1 8c893586f09ed6129f673a772ee665c57b01028a SHA256 813d2b3cb6542f7a583ebdedf9ea3f437e9056327b8424c16879fb2243a910bf
+MISC ChangeLog 3444 RMD160 d1939032e52bb7b1f8d276b91cd2961ff465c277 SHA1 984d6f55b5822216120427e070577fe613d1dd74 SHA256 bc158a8e2df2e66d36f9b7f0620a4affd749badff16284b0f61633ebe6f470ad
+MISC metadata.xml 304 RMD160 dd8f44beb660d049dc89b2e820ce4d78ecb728d9 SHA1 1051710172e5a0841f5ac6f415ae7de277b4c682 SHA256 5d1948256efe3036c87ae2431c81e91d369a4c1cc32c02e8fb50f76c5dd372dd

diff --git a/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild
new file mode 100644
index 0000000..7d3610b
--- /dev/null
+++ b/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ivtv/xf86-video-ivtv-1.1.2.ebuild,v 1.3 2011/03/26 10:42:33 fauli Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for TV-out on ivtvdev cards"
+HOMEPAGE="http://ivtvdriver.org/"
+SRC_URI="http://dl.ivtvdriver.org/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""

diff --git a/x11-drivers/xf86-video-mach64/Manifest b/x11-drivers/xf86-video-mach64/Manifest
new file mode 100644
index 0000000..de9b36d
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/Manifest
@@ -0,0 +1,8 @@
+DIST xf86-video-mach64-6.8.2.tar.bz2 486282 RMD160 023532c3694cf6e0108b6dd8d816c5c59e46ba8b SHA1 b7303689a6a971b956061fd81399dc81adb865af SHA256 b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d
+DIST xf86-video-mach64-6.9.0.tar.bz2 505200 RMD160 dd0626931ca0555fc5787c30c0a50fe1cc12b9f5 SHA1 95a7ec9761fe11dadbcd9078c55148198a91b2f1 SHA256 a214f066c1cc997cb2d4db8474b51f731b51f8486c023c62a0e2c69f283bcd1a
+DIST xf86-video-mach64-6.9.1.tar.bz2 534392 RMD160 539ab5e96c02ec9f73240bed0925709d05b0a6b0 SHA1 7129cf61a1c70d923a370fea66686d7a13be8fe8 SHA256 9f6ad49f07c8785a64caac6f4aaf58fc7746a24b718491d047c45bc1ee9e834e
+EBUILD xf86-video-mach64-6.8.2.ebuild 814 RMD160 da13c3c82e763616f8e878d33ddf64645ef0e6d7 SHA1 1e7052caace9ce25f39407cfa09b3c1339437f24 SHA256 7dac9f6f03127e13e89377fae945e86d044306aad06958315ea92e3346cbe189
+EBUILD xf86-video-mach64-6.9.0.ebuild 543 RMD160 9c0afe3540c3afe9aed333ac6878aab3817e8fca SHA1 964376fd649698e80827f24d61dc0d7778c5bbfd SHA256 9fac9a20fe63dec07a1389d72dc2323b1e04658ba07a5cfb184c676aa8c3ce64
+EBUILD xf86-video-mach64-6.9.1.ebuild 556 RMD160 ff9b3262fc5fa2c5e7b4ba46a441189c9ed42f9c SHA1 9f4e1ad5f910c7806374e413d6c1f1875f632d6e SHA256 481dd8cf5cac6fb5c77c292c88ebc47376c42c620d783bf1532744712f04a7d8
+MISC ChangeLog 3865 RMD160 6243d03edeafb41f328d52a7ff8bdd890f45d1a4 SHA1 d42ec206778fc7d6f6a2a34a4e74e5c51d9c51bd SHA256 9c4394457236cee377dfa5cef3b2a4d38cf289cdf6222e703863a17b105fcfa3
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.2.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.2.ebuild
new file mode 100644
index 0000000..49abc7d
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.8.2.ebuild,v 1.7 2009/12/15 19:29:49 ranger Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="ATI Mach64 video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	!<x11-drivers/xf86-video-ati-6.9"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xf86miscproto
+	x11-proto/xproto
+	dri? ( x11-proto/glproto
+			x11-proto/xf86driproto
+			>=x11-libs/libdrm-2 )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.0.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.0.ebuild
new file mode 100644
index 0000000..6f77ced
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.0.ebuild,v 1.6 2011/07/30 10:49:15 armin76 Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI="dri"
+inherit xorg-2
+
+DESCRIPTION="ATI Mach64 video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.10"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+
+	xorg-2_pkg_setup
+}

diff --git a/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild
new file mode 100644
index 0000000..60096de
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mach64/xf86-video-mach64-6.9.1.ebuild,v 1.4 2012/06/24 19:08:55 ago Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI="dri"
+inherit xorg-2
+
+DESCRIPTION="ATI Mach64 video driver"
+
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.10"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+
+	xorg-2_pkg_setup
+}

diff --git a/x11-drivers/xf86-video-mga/Manifest b/x11-drivers/xf86-video-mga/Manifest
new file mode 100644
index 0000000..fe10ddd
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-mga-1.4.13.tar.bz2 423134 RMD160 c68d9e02ec322d23f9be7b06c54895a05cf5f962 SHA1 55aa185cf381def4b5905c8b93694b8dfbd5c378 SHA256 b657bd5fec4aade6396c683886739b7c8ce57924278bee0e36f13a966eeddff6
+DIST xf86-video-mga-1.5.0.tar.bz2 431769 RMD160 9f038d430dfaf08299ad942ff320d6bf1d1d3ac3 SHA1 de82e4dc8d05fe1306498e3067f9e65479cfa5a1 SHA256 ca983d780dd90115c0599980a7a83425b5e4eeb16f2e8c7fed15823fcbe7830e
+EBUILD xf86-video-mga-1.4.13.ebuild 697 RMD160 93ec6daf94e2561db022be1df0d6d0b96a4c5700 SHA1 226e3724dd8ad1249dc1d4e0e8b701c2f49c237a SHA256 783ec41a83568b2b07070bcbb31cde87adf3f49d6b550a93aa16af6008e4b4a5
+EBUILD xf86-video-mga-1.5.0.ebuild 525 RMD160 14a53c105d682e44934c41d78e82f3eb18e04033 SHA1 1a97a16800e9ccde0c6c9b02a7b02128b698f249 SHA256 1060ce1c16b397825700238e38b4b22c199e61244fc64f1dd28230351f606e0f
+MISC ChangeLog 14319 RMD160 f3a0c8623766196e1705c25fe8dbad87f22cb28e SHA1 331ede2b301daa2a36d4700f0159df9f3950f482 SHA256 73786ccf88a2b35b0d9ebeeb8c4906984da14019b71cd78ab0b9c0613649ee2c
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.13.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.13.ebuild
new file mode 100644
index 0000000..f076e9a
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.4.13.ebuild,v 1.6 2011/02/14 23:56:22 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="Matrox video driver"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.4"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			x11-proto/glproto
+			>=x11-libs/libdrm-2 )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild b/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild
new file mode 100644
index 0000000..9e32733
--- /dev/null
+++ b/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-mga/xf86-video-mga-1.5.0.ebuild,v 1.4 2012/06/24 19:09:31 ago Exp $
+
+EAPI="4-slot-abi"
+XORG_DRI=dri
+inherit xorg-2
+
+DESCRIPTION="Matrox video driver"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.4"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-modesetting/Manifest b/x11-drivers/xf86-video-modesetting/Manifest
new file mode 100644
index 0000000..9f18328
--- /dev/null
+++ b/x11-drivers/xf86-video-modesetting/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-modesetting-0.3.0.tar.bz2 289304 RMD160 51025b2feeaee32d5548671969deb5783bec4d27 SHA1 b8a27127fa83eba483265d5c5ce944e7768bff1b SHA256 0d9e78fa089373350e11dcb88ef7a4d8cfac9234cce2b4ca39a943e80b8a1b95
+DIST xf86-video-modesetting-0.4.0.tar.bz2 296277 RMD160 1aa8b8875cb01e5e82dad84af59f463e3420cc39 SHA1 c253af87acaa8405f93e3fec357071a2763a1855 SHA256 ffc6ee47423292023f536440db5bb16d6ba9d7ea6ac3c018f1484fe1fe705e55
+EBUILD xf86-video-modesetting-0.3.0.ebuild 457 RMD160 d608a7d01b261937427cef90e9fa3d80a4058d00 SHA1 966080484768191e5e09e856303f24a589cda027 SHA256 57e6ece821b85e0b7765f1e14d2e5b8721e46fcc59603c1eddb4d9494ed9f155
+EBUILD xf86-video-modesetting-0.4.0.ebuild 463 RMD160 e09dafc59cc90121b16da3cf08b466538e8a9c41 SHA1 dccc24188a7171afed9ac12861b9426743ffa6b7 SHA256 ac97b0b1f10aaf87f6c0abaa8a524683d302c0d1ac0027f0aeaf1b5efd872d63
+MISC ChangeLog 2308 RMD160 a794dae08ee7950701ab320c12842958d3627d02 SHA1 0799589817968ba99813fda77ec8218def91c643 SHA256 2519794fd7c86388f881a7d82505b9ba21693202808b837d4694d7e63cb54753
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild
new file mode 100644
index 0000000..aac74e8
--- /dev/null
+++ b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.3.0.ebuild,v 1.7 2012/06/28 20:53:05 maekke Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
+
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""

diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.4.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.4.0.ebuild
new file mode 100644
index 0000000..5973411
--- /dev/null
+++ b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.4.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.4.0.ebuild,v 1.1 2012/06/22 21:58:03 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""

diff --git a/x11-drivers/xf86-video-neomagic/Manifest b/x11-drivers/xf86-video-neomagic/Manifest
new file mode 100644
index 0000000..540d3d2
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-neomagic-1.2.5.tar.bz2 294723 RMD160 28769eb10adc9d8487d17da83745ea6f39f1d586 SHA1 02c994e2eae191b50a8cd556e5b52d82725073b3 SHA256 c0b69e83a4bd6c257a2bf55b33a7442d33df451d37561fa8ae00fb1566b1504b
+DIST xf86-video-neomagic-1.2.6.tar.bz2 325498 RMD160 e6ff556610a9e82918dada0aa24e178f44dc1de5 SHA1 35ac1d62357fa2ddc37473b24335db441bc70f4d SHA256 b19ed2a33e8d9a3e2bfc1ae3e8ff49031b7d34dec786e4a5e060e68e48649888
+EBUILD xf86-video-neomagic-1.2.5.ebuild 564 RMD160 20eb2f244ab3fe374dfd90c41a419a2c27a77339 SHA1 a9819ff3f41d717911c9b274e5bcf5d05b599261 SHA256 95414dcdf8b4f3a995be5879fc04e3d57dc9295efe16994fbd4a1d6da9d9e66d
+EBUILD xf86-video-neomagic-1.2.6.ebuild 432 RMD160 c726bc0c51c11abbaf72b1aee3e810165f6ddf0d SHA1 317745bd7ce59efaa0604c99feefd0ab41f110bb SHA256 de841e870d0b5afba92d0c9b9cf26f8218044031024031d23d0f3fb6a3dcde44
+MISC ChangeLog 6373 RMD160 e0e5baf3a8440360169b5deeba51dda90a942ca6 SHA1 785e00dd2d1678a91bfa4ec4d49cb01d86c49fb6 SHA256 f01513e6cebe00705cbb1a1ad2ed517524ec639ebbc1a39de366b440f29e410f
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.5.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.5.ebuild
new file mode 100644
index 0000000..0580cef
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.5.ebuild,v 1.4 2011/02/12 19:26:22 armin76 Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="Neomagic video driver"
+KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild
new file mode 100644
index 0000000..3285ff8
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.6.ebuild,v 1.4 2012/06/24 19:10:30 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Neomagic video driver"
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-newport/Manifest b/x11-drivers/xf86-video-newport/Manifest
new file mode 100644
index 0000000..6d3d351
--- /dev/null
+++ b/x11-drivers/xf86-video-newport/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-newport-0.2.3.tar.bz2 266377 RMD160 2726f707a073e6fbd8ec23bbc62c7159d9fddbd9 SHA1 018243071fbadb4fa28a6383465c71b2f5fb62e4 SHA256 e6caeb4f95adfd9d2046d24f5f3688092ea4e3fb63aa3d0675f6c697c8cf0270
+DIST xf86-video-newport-0.2.4.tar.bz2 308541 RMD160 fc1ae9c73495268691efe95f7cc9be3a28a64fba SHA1 666d3794833281bea24cb8015d9464753ba9885c SHA256 91cc41c6b17b068ed865c5d00b7662faaa1f7523ca449200abcd6539c4ad4ef9
+EBUILD xf86-video-newport-0.2.3.ebuild 378 RMD160 708fdabb303a7bd253057d532f895ca1778d7b9e SHA1 9b3e47dcca82c1f8392647481dd92fb9673df3cb SHA256 8b0888e0093232addb150ca5013db46b9848da967d04adc37dc53808a275fb7e
+EBUILD xf86-video-newport-0.2.4.ebuild 377 RMD160 f8cb5d527b25b23ddaedcda0754da89509e01401 SHA1 2f247edf145e2ed0601a56c442ed390e91f1c4e0 SHA256 8567e25cbfa980a596e3b34634ad7843234b6fb25faad464ea4947c5eda50e93
+MISC ChangeLog 4053 RMD160 969cf122efadb611ed78f6f07858eb1bd59c974a SHA1 786188a8e70663527845aaeb8434940c60b82793 SHA256 344bcccfcfb6861be7ee34285dc8c7d7ffa290cea5f6f18e02247e3d71964da0
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.3.ebuild b/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.3.ebuild
new file mode 100644
index 0000000..525867e
--- /dev/null
+++ b/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.3.ebuild,v 1.1 2011/04/18 13:42:46 scarabeus Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Newport video driver"
+KEYWORDS="-* ~mips"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.4.ebuild b/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.4.ebuild
new file mode 100644
index 0000000..8781256
--- /dev/null
+++ b/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-newport/xf86-video-newport-0.2.4.ebuild,v 1.1 2012/05/13 20:08:31 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="Newport video driver"
+KEYWORDS="-* ~mips"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
new file mode 100644
index 0000000..77bc0a5
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -0,0 +1,12 @@
+DIST xf86-video-nouveau-0.0.16_pre20111109.tar.bz2 143258 RMD160 8c70072dc82754c798fb695afcf25f3d54388d9d SHA1 02d492d40020706497cf39f042b72f8d8d8d52a8 SHA256 ce103f80f27ee7288dfbfd7a3d59d7cb72bff802d8e0a046dd39546bf61cadc2
+DIST xf86-video-nouveau-0.0.16_pre20120305.tar.bz2 133627 RMD160 e61a8cc969ec5ba0deefe1f3d6b860f1f62ba216 SHA1 0d24d3fbc4bf152bda883e123196ad0ce6999436 SHA256 ed74b60e4c63e3dd70204ff3475cc7cb2edfe98ec0b7f3ee50ee40a0649964ee
+DIST xf86-video-nouveau-0.0.16_pre20120322.tar.bz2 133789 RMD160 a55d4eecfc03452be265cfdfbcb3e7490bd7dadb SHA1 0ac4674c349da2b2bf3e2315e60c72b20e5f458e SHA256 5cd902e8986baecdf1acdf7b4834fe2dd81aaf2b350a17736040a590d10c7930
+DIST xf86-video-nouveau-0.0.16_pre20120508.tar.bz2 130550 RMD160 d6b59b348e797e057e75a60d3e2edaa828d98716 SHA1 363e291e06db111133746392f5895b355b3ea819 SHA256 4794162e038f0e62ed034c0c7e520ae0725f0c1837cad5f72602e86c7cff6825
+DIST xf86-video-nouveau-1.0.1.tar.bz2 518993 RMD160 cb26972840646460393bab53de6fba8bd9a249a5 SHA1 6842855557cc717c2eab445e0907211d7424cbed SHA256 0b27a3bbbd97e71fb2248864b5c6c769f844d5e6bbb21351baa54f36a5f839f1
+EBUILD xf86-video-nouveau-0.0.16_pre20111109.ebuild 1037 RMD160 9b82509eb8e3d51fb5d15e708481815b4147f40b SHA1 1af91f07b53107303a3dacd22e4636b886cec873 SHA256 c3fb5ca32c5d958ed99da39d1f9e3595ee1eb2f83937e68a8b6a540e0a84a76f
+EBUILD xf86-video-nouveau-0.0.16_pre20120305.ebuild 1041 RMD160 f39efce483bf7f377d49b2a7135aec03c0c946f8 SHA1 b3ab9f10670ce6190e6c4e47295d2227d6f5d3f2 SHA256 12d6772b763e246eeda452087f261b5b6732beddf41f47330abd976dd34a16e6
+EBUILD xf86-video-nouveau-0.0.16_pre20120322.ebuild 1034 RMD160 653537fefcf4c11807081eb9de79272c2aa47f18 SHA1 225fcd536860d70cd99357ab565e21813470b574 SHA256 caf080234fbc76bdfb7b75ca31aca096d3a5ea65c5b0d66751260b8241b9ee3a
+EBUILD xf86-video-nouveau-0.0.16_pre20120508.ebuild 995 RMD160 74afa5670d5a836a8598d0cc28d3de92d29909c5 SHA1 77e79e94ed3f63c563a8efe2a38e7f959ae5c069 SHA256 6be2d14c363be94da67ec341273c2c1b24d4914483ba2f7073c6f8cbe7a978cc
+EBUILD xf86-video-nouveau-1.0.1.ebuild 982 RMD160 f281068bf948a8e27370727f678d04658edc8938 SHA1 b1df676c17f5e5dcd984b06c6f2aeb536d545bfc SHA256 3e25c009b17f21a1daf6af5f8f8984f8a96066f5039e5c6991dd39df840165d1
+MISC ChangeLog 9206 RMD160 c2bc4884f85d4621157f459065ad749b180d0584 SHA1 ed6372459c5f5cb93930f3ce580337d4589eb618 SHA256 d9778565727eae26fbaf4ac8a5d0d38d34060259b775c121a4d1826367a34fff
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild
new file mode 100644
index 0000000..52407b1
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20111109.ebuild,v 1.6 2012/05/11 00:35:39 chithanh Exp $
+
+EAPI="4-slot-abi"
+XORG_EAUTORECONF="yes"
+XORG_DRI="always"
+inherit linux-info xorg-2
+
+DESCRIPTION="Accelerated Open Source driver for nVidia cards"
+HOMEPAGE="http://nouveau.freedesktop.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]
+	<x11-libs/libdrm-2.4.34[video_cards_nouveau]"
+DEPEND="${RDEPEND}
+	x11-proto/glproto
+	x11-proto/xf86driproto
+	x11-proto/dri2proto"
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if ! has_version x11-base/nouveau-drm; then
+		if ! linux_config_exists || ! linux_chkconfig_present DRM_NOUVEAU; then
+			ewarn "Nouveau DRM not detected. If you want any kind of"
+			ewarn "acceleration with nouveau, enable CONFIG_DRM_NOUVEAU"
+			ewarn "in the kernel."
+		fi
+	fi
+}

diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild
new file mode 100644
index 0000000..eef0790
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120305.ebuild,v 1.2 2012/05/11 00:35:39 chithanh Exp $
+
+EAPI="4-slot-abi"
+XORG_EAUTORECONF="yes"
+XORG_DRI="always"
+inherit linux-info xorg-2
+
+DESCRIPTION="Accelerated Open Source driver for nVidia cards"
+HOMEPAGE="http://nouveau.freedesktop.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]
+	<x11-libs/libdrm-2.4.34[video_cards_nouveau]"
+DEPEND="${RDEPEND}
+	x11-proto/glproto
+	x11-proto/xf86driproto
+	x11-proto/dri2proto"
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if ! has_version x11-base/nouveau-drm; then
+		if ! linux_config_exists || ! linux_chkconfig_present DRM_NOUVEAU; then
+			ewarn "Nouveau DRM not detected. If you want any kind of"
+			ewarn "acceleration with nouveau, enable CONFIG_DRM_NOUVEAU"
+			ewarn "in the kernel."
+		fi
+	fi
+}

diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
new file mode 100644
index 0000000..db776a0
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120322.ebuild,v 1.4 2012/06/24 19:10:59 ago Exp $
+
+EAPI="4-slot-abi"
+XORG_EAUTORECONF="yes"
+XORG_DRI="always"
+inherit linux-info xorg-2
+
+DESCRIPTION="Accelerated Open Source driver for nVidia cards"
+HOMEPAGE="http://nouveau.freedesktop.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.24[video_cards_nouveau]
+	<x11-libs/libdrm-2.4.34[video_cards_nouveau]"
+DEPEND="${RDEPEND}
+	x11-proto/glproto
+	x11-proto/xf86driproto
+	x11-proto/dri2proto"
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if ! has_version x11-base/nouveau-drm; then
+		if ! linux_config_exists || ! linux_chkconfig_present DRM_NOUVEAU; then
+			ewarn "Nouveau DRM not detected. If you want any kind of"
+			ewarn "acceleration with nouveau, enable CONFIG_DRM_NOUVEAU"
+			ewarn "in the kernel."
+		fi
+	fi
+}

diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild
new file mode 100644
index 0000000..b0123b4
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-0.0.16_pre20120508.ebuild,v 1.1 2012/05/11 00:35:39 chithanh Exp $
+
+EAPI="4-slot-abi"
+XORG_EAUTORECONF="yes"
+XORG_DRI="always"
+inherit linux-info xorg-2
+
+DESCRIPTION="Accelerated Open Source driver for nVidia cards"
+HOMEPAGE="http://nouveau.freedesktop.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]"
+DEPEND="${RDEPEND}
+	x11-proto/glproto
+	x11-proto/xf86driproto
+	x11-proto/dri2proto"
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if ! has_version x11-base/nouveau-drm; then
+		if ! linux_config_exists || ! linux_chkconfig_present DRM_NOUVEAU; then
+			ewarn "Nouveau DRM not detected. If you want any kind of"
+			ewarn "acceleration with nouveau, enable CONFIG_DRM_NOUVEAU"
+			ewarn "in the kernel."
+		fi
+	fi
+}

diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.1.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.1.ebuild
new file mode 100644
index 0000000..5193559
--- /dev/null
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.1.ebuild,v 1.1 2012/06/22 21:53:48 chithanh Exp $
+
+EAPI="4-slot-abi"
+XORG_DRI="always"
+inherit linux-info xorg-2
+
+DESCRIPTION="Accelerated Open Source driver for nVidia cards"
+HOMEPAGE="http://nouveau.freedesktop.org/"
+SRC_URI="http://nouveau.freedesktop.org/release/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]"
+DEPEND="${RDEPEND}
+	x11-proto/glproto
+	x11-proto/xf86driproto
+	x11-proto/dri2proto"
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if ! has_version x11-base/nouveau-drm; then
+		if ! linux_config_exists || ! linux_chkconfig_present DRM_NOUVEAU; then
+			ewarn "Nouveau DRM not detected. If you want any kind of"
+			ewarn "acceleration with nouveau, enable CONFIG_DRM_NOUVEAU"
+			ewarn "in the kernel."
+		fi
+	fi
+}

diff --git a/x11-drivers/xf86-video-openchrome/Manifest b/x11-drivers/xf86-video-openchrome/Manifest
new file mode 100644
index 0000000..60713d0
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-openchrome-0.2.905.tar.bz2 508469 RMD160 cd8b60b3ba48af8f831a1a2496b5ceabc2c74148 SHA1 bbd64f258e69b29498e5f68d5a28e5253d252dd1 SHA256 0c8f15fb798680a429089a58d5211f9064797e3720010d599acc010d04a88bd2
+DIST xf86-video-openchrome-0.2.906.tar.bz2 514154 RMD160 0a826707b45f3fd17576a82f1f8f589b2d9768c1 SHA1 1c49bf722326442393288db490ff48d437e337f9 SHA256 e7558edc144a08371493432014a7b88ee26ec35d00ef96f2ea24bd7872b0ff41
+EBUILD xf86-video-openchrome-0.2.905.ebuild 1354 RMD160 565998a91ff71e7622c036bf7a0350ff70320a22 SHA1 cd3ffa2e87e95fa88d51eece6671028f6e402e3d SHA256 6026604b0e2f463c7fd0f140cc532a33e4e3075334831c0c9bee6e33d6eaf834
+EBUILD xf86-video-openchrome-0.2.906.ebuild 1347 RMD160 5de690c6d42d0e87a85f43e1be6285b6baa32811 SHA1 b53f33329994e54efa61bad2b4d14aba02a36484 SHA256 e6236cf4bf05fcebe8ec9595460edde57af6b69d83d5b82fa0fbf5980c5600a4
+MISC ChangeLog 10528 RMD160 4c23c53a53a88406b9f97039b9c5276115d79895 SHA1 6a4822ba0124b5f7fc146e32f605ae83e09192ea SHA256 523fd47707f3ab4ff4e3bbc45f049785d78b218a8be07740542cea958d24ac30
+MISC metadata.xml 315 RMD160 9fc61675d6a4140a8da6b8c7018ba06b761f7e20 SHA1 391456b7e6e8caeecde821fecb1f5d94fda9c717 SHA256 d8fa3d7ffb55c1f06f7041b80ce125721c371afc0762ebb197db44821b2b08e8

diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.905.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.905.ebuild
new file mode 100644
index 0000000..d2dbdad
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.905.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.905.ebuild,v 1.4 2012/04/05 20:35:21 phajdan.jr Exp $
+
+EAPI="4-slot-abi"
+XORG_DRI="dri"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for VIA/S3G cards"
+HOMEPAGE="http://www.openchrome.org"
+SRC_URI="http://www.openchrome.org/releases/${P}.tar.bz2"
+LICENSE="MIT"
+
+KEYWORDS="amd64 x86"
+IUSE="debug viaregtool"
+
+RDEPEND=">=x11-base/xorg-server-1.9"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-libs/libXvMC
+	x11-libs/libdrm
+"
+
+DOCS=( ChangeLog NEWS README )
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+		$(use_enable debug xv-debug)
+		$(use_enable viaregtool)
+	)
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+
+	elog "Supported chipsets:"
+	elog "CLE266 (VT3122), KM400/P4M800 (VT3205), K8M800 (VT3204),"
+	elog "PM800/PM880/CN400 (VT3259), VM800/CN700/P4M800Pro (VT3314),"
+	elog "CX700 (VT3324), P4M890 (VT3327), K8M890 (VT3336),"
+	elog "P4M900/VN896 (VT3364), VX800 (VT3353), VX855 (VT3409), VX900"
+	elog
+	elog "The driver name is 'openchrome', and this is what you need"
+	elog "to use in your xorg.conf (and not 'via')."
+	elog
+	elog "See the ChangeLog and release notes for more information."
+}

diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
new file mode 100644
index 0000000..ba4934c
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.2.906.ebuild,v 1.3 2012/06/24 11:16:53 ago Exp $
+
+EAPI="4-slot-abi"
+XORG_DRI="dri"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for VIA/S3G cards"
+HOMEPAGE="http://www.openchrome.org"
+SRC_URI="http://www.openchrome.org/releases/${P}.tar.bz2"
+LICENSE="MIT"
+
+KEYWORDS="amd64 x86"
+IUSE="debug viaregtool"
+
+RDEPEND=">=x11-base/xorg-server-1.9"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-libs/libXvMC
+	x11-libs/libdrm
+"
+
+DOCS=( ChangeLog NEWS README )
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+		$(use_enable debug xv-debug)
+		$(use_enable viaregtool)
+	)
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+
+	elog "Supported chipsets:"
+	elog "CLE266 (VT3122), KM400/P4M800 (VT3205), K8M800 (VT3204),"
+	elog "PM800/PM880/CN400 (VT3259), VM800/CN700/P4M800Pro (VT3314),"
+	elog "CX700 (VT3324), P4M890 (VT3327), K8M890 (VT3336),"
+	elog "P4M900/VN896 (VT3364), VX800 (VT3353), VX855 (VT3409), VX900"
+	elog
+	elog "The driver name is 'openchrome', and this is what you need"
+	elog "to use in your xorg.conf (and not 'via')."
+	elog
+	elog "See the ChangeLog and release notes for more information."
+}

diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest
new file mode 100644
index 0000000..8cd2fd2
--- /dev/null
+++ b/x11-drivers/xf86-video-qxl/Manifest
@@ -0,0 +1,10 @@
+DIST xf86-video-qxl-0.0.13.tar.bz2 336701 RMD160 149ffb5478a696f220b7f4eb7420f0ce9432daf2 SHA1 67c358c4a4c2adfa039d024f0c5d2ba2ba9ac6aa SHA256 59bc60c3faeba75942bf366e566fa2da3eb034850f919b5667dd22589802ad61
+DIST xf86-video-qxl-0.0.14.tar.bz2 337392 RMD160 9578a172f249ee749620ab83bbc176ae9026250f SHA1 49648337fa7ad3f098811f04855228829769f79b SHA256 7283a3719cc71fe98045d92ed0d480aaccd3a5e202fc30cbe0103458a7ff2e60
+DIST xf86-video-qxl-0.0.16.tar.bz2 408156 RMD160 b520dee62a5da3d0ede4d291082fb04fa70e0891 SHA1 efdf1f553ddd63b36b4e1d47d98955d72da45ac3 SHA256 4b2dbfd5386b8d8f602f39a55e054b218a70aea332db5febcd936c0a890081d4
+DIST xf86-video-qxl-0.0.17.tar.bz2 379844 RMD160 f6d8bd51e621b9e602af3c8d6f19f05b41717e58 SHA1 b4efa1cde649c0f3b362c9872041397a973c7526 SHA256 193c2bb4889de39f7b0071990adaae1753b45e542f68d76cc0d55a7299b49f82
+EBUILD xf86-video-qxl-0.0.13.ebuild 488 RMD160 e95d2b7909275796c999e796c0d459754c5012ab SHA1 8000e28a38935422ff30b427dbce9da42a4b9114 SHA256 04b882c2f44432f2308438504aa9f4081f66c3cd9a464baca59109dce46510e3
+EBUILD xf86-video-qxl-0.0.14.ebuild 473 RMD160 2b4cd5c792c5df7af919aacfec027a747a9f809a SHA1 d3ad2950dc66bd23d1686cb6bc9f5d211a89d531 SHA256 399b02e7b6765637369249c68708de273792d01fe891e7572be01aba09f269ae
+EBUILD xf86-video-qxl-0.0.16.ebuild 597 RMD160 1477e4a0854594a21bd6466dde7ee22b4161fbfa SHA1 b8b7a9d9eeab23479e59b779039cfc2b19af7c39 SHA256 564349a9d1c8faf9d9499a8dd54e9cde368c428621e356ba24ca91e8589d60c5
+EBUILD xf86-video-qxl-0.0.17.ebuild 594 RMD160 95cf9dfb3180732c3c568bb7924dd269f5df664d SHA1 208eae2f0259bb8bc9aa52e38cb34ae4fa5bfcf8 SHA256 2b0605d8762b9a0a220223ba39b9af9539c21815c18d75d463d40fac7df5e4b5
+MISC ChangeLog 2068 RMD160 42f1f5f5c6e4bf2e7eb5f7727abfa25bd429887f SHA1 38963d890e4df3ce8397d9d78997ffabbeb48c7e SHA256 3e37cecc0f2bed8ddd42b0ea3739118c96872cca0993784f9020e99f0f2b3eac
+MISC metadata.xml 220 RMD160 4d5c4903f7c543bd8ef09e0d42de089b9bc5f8e2 SHA1 b3d72a7ab8c13d56747dcde3ffa5bc7025a65cf9 SHA256 02098a3246ae2126fbc3d37008096f3ebfcd48cbb57947f910df9aebf8164849

diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.13.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.13.ebuild
new file mode 100644
index 0000000..81ab2d5
--- /dev/null
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.13.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.13.ebuild,v 1.3 2011/03/26 10:43:19 fauli Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="QEMU QXL paravirt video driver"
+
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server[-minimal]"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xf86dgaproto"

diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.14.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.14.ebuild
new file mode 100644
index 0000000..b42fa56
--- /dev/null
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.14.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.14.ebuild,v 1.3 2012/01/18 17:39:01 cardoe Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="QEMU QXL paravirt video driver"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server[-minimal]"
+DEPEND="${RDEPEND}
+	x11-proto/xf86dgaproto
+	>=app-emulation/spice-protocol-0.7.0"

diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.16.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.16.ebuild
new file mode 100644
index 0000000..21fd297
--- /dev/null
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.16.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.16.ebuild,v 1.5 2012/01/18 17:39:01 cardoe Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="QEMU QXL paravirt video driver"
+
+KEYWORDS="amd64 x86"
+IUSE="xspice"
+
+RDEPEND="xspice? ( app-emulation/spice )
+	x11-base/xorg-server[-minimal]"
+DEPEND="${RDEPEND}
+	x11-proto/xf86dgaproto
+	>=app-emulation/spice-protocol-0.8.1"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable xspice)
+	)
+}

diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild
new file mode 100644
index 0000000..759ca03
--- /dev/null
+++ b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.0.17.ebuild,v 1.3 2012/06/24 19:11:22 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="QEMU QXL paravirt video driver"
+
+KEYWORDS="amd64 x86"
+IUSE="xspice"
+
+RDEPEND="xspice? ( app-emulation/spice )
+	x11-base/xorg-server[-minimal]"
+DEPEND="${RDEPEND}
+	x11-proto/xf86dgaproto
+	>=app-emulation/spice-protocol-0.8.1"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable xspice)
+	)
+}

diff --git a/x11-drivers/xf86-video-r128/Manifest b/x11-drivers/xf86-video-r128/Manifest
new file mode 100644
index 0000000..04ccd62
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-r128-6.8.1.tar.bz2 418251 RMD160 8042f62bd23c7b24a24a5d55c53b4e6085dcfa1a SHA1 14f33cbd248dfd1584ee14949475ab3bb922da17 SHA256 517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
+DIST xf86-video-r128-6.8.2.tar.bz2 469957 RMD160 913b602f04c121c9adcfeabb24d8e3102d76eea6 SHA1 bb01cbdc173dbb53070c4ac06f3eeb3ad2645164 SHA256 7b41135c3d177e61644573e5c16e35fd9eff98b4d6685c9c6de9e33401e904b1
+EBUILD xf86-video-r128-6.8.1.ebuild 811 RMD160 ff73efa9f0824fff42be3d9f8651d83930f8a57a SHA1 8d798c622f1bb11c7d04e0b5638f33f710e82c89 SHA256 46934f9cb094989bf9f78d9374781be0f75e21ec9169194f39dbadda3aee2a38
+EBUILD xf86-video-r128-6.8.2-r1.ebuild 536 RMD160 c7c96484eef14bcb775139f61b6b82b91aceb6d5 SHA1 ccbbbdcb0914f61273de396a243341e85b764528 SHA256 36a9c6421ebce5e434dadc531c857974d7e05519e3c9948ce79be4e189566a48
+MISC ChangeLog 3552 RMD160 60e6dc25aebd39b89611587c9fc59a99df00f768 SHA1 bd7af83c4fbecc701a0583953db6d31f71321925 SHA256 7706fa4d4e9a08caa66c205c1fa10e2e0dcaab4d9854d55b9afe520685b14209
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.1.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.1.ebuild
new file mode 100644
index 0000000..48af9d4
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.1.ebuild,v 1.7 2009/12/15 19:30:55 ranger Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="ATI Rage128 video driver"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	!<x11-drivers/xf86-video-ati-6.9"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xf86miscproto
+	x11-proto/xproto
+	dri? ( x11-proto/glproto
+			x11-proto/xf86driproto
+			>=x11-libs/libdrm-2 )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild
new file mode 100644
index 0000000..bdae25e
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-r128/xf86-video-r128-6.8.2-r1.ebuild,v 1.3 2012/06/24 19:11:59 ago Exp $
+
+EAPI="4-slot-abi"
+XORG_DRI=dri
+inherit xorg-2
+
+DESCRIPTION="ATI Rage128 video driver"
+
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+}

diff --git a/x11-drivers/xf86-video-s3/Manifest b/x11-drivers/xf86-video-s3/Manifest
new file mode 100644
index 0000000..73fc4b3
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-s3-0.6.3.tar.bz2 277148 RMD160 105b4f0e954772e074120c769ee817ed5cec8a9f SHA1 5953c5c9cdc84487d1997a3cb5f8ff857cdf033b SHA256 ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
+DIST xf86-video-s3-0.6.4.tar.bz2 324946 RMD160 defdefb5b42b6e7cc24b2e564f93c74a98eb3780 SHA1 9170e57f966d810fdfc2de4473a7c8e814019c31 SHA256 1b5f6c4cd02ab13a7d2d0ebb45a7b463650a0187a75e4516a16edb738ce909ff
+EBUILD xf86-video-s3-0.6.3.ebuild 593 RMD160 aabd0b38c7d8830a16ee08c1fb618ba2f19aa563 SHA1 2ed8e4cee4a7e7d161be22fa09fe62c283ca049d SHA256 0967610eafcd6a7f609316b81f0c8017ded2a69046c12ce31b6ef3f54a6f3d98
+EBUILD xf86-video-s3-0.6.4.ebuild 437 RMD160 432f4249ec0ddc0c73fd05b04ad1b32adac2274d SHA1 889ddede7e1ff74a6d78b7635b6ddf0c32d018f3 SHA256 9294cf25569a43c8ec4115fa6c64d46f766c361d59f6790e56b903658f72c8ea
+MISC ChangeLog 6463 RMD160 c001e7502cf2032c674e5ef7b06883426e5e242b SHA1 dfe13924e6a1985d340fb03df82ed606c8f66b8f SHA256 8e9ad665282c225c26f3b8163bac62128db7a41551df8e8dcea362835cbf4d12
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.3.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.3.ebuild
new file mode 100644
index 0000000..a10c103
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.3.ebuild,v 1.5 2009/12/15 15:42:27 armin76 Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for s3 cards"
+KEYWORDS="alpha amd64 ia64 ppc x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild
new file mode 100644
index 0000000..cde4273
--- /dev/null
+++ b/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3/xf86-video-s3-0.6.4.ebuild,v 1.4 2012/06/24 19:12:29 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="X.Org driver for s3 cards"
+
+KEYWORDS="~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-s3virge/Manifest b/x11-drivers/xf86-video-s3virge/Manifest
new file mode 100644
index 0000000..59c33a4
--- /dev/null
+++ b/x11-drivers/xf86-video-s3virge/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-s3virge-1.10.4.tar.bz2 300224 RMD160 0a60c63a28272dd404cfe33f62307d5cb0f1a981 SHA1 69b83a1e9bba5176d6c0ff95d531117734f02eec SHA256 1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
+DIST xf86-video-s3virge-1.10.5.tar.bz2 348314 RMD160 e6b8e8037030e0ed40573ec5c4e7869224c3be27 SHA1 ca8aa877ae118b017d5b06951bc1c3b7690ba709 SHA256 583b2d2982c2dd8b3c2d8f09c3cbca901c3cb844115ac99251ae6521560fac31
+EBUILD xf86-video-s3virge-1.10.4.ebuild 600 RMD160 a271980495d49a0a721d7d6994ddaa9c63238c81 SHA1 04e0116fd6ac96238ba21df6a1e52ca9e5f1df75 SHA256 253ba8c4cc6500801c20cb3b68d423bd36895b0e612b59c492e2e18370fcb36a
+EBUILD xf86-video-s3virge-1.10.5.ebuild 444 RMD160 9491438a9dbd595f7f5835d0b8e3db64ace39e56 SHA1 11ad65a8b911a30c6c31cbd5441413d48239054d SHA256 a6720d183643e1aacd2f8213ffbb3867c76b4259c575d1243cf03f895c35349b
+MISC ChangeLog 6015 RMD160 072665e829ff6bcb3805284e03d87249a1d42976 SHA1 ed4439396a49787a153ff1537a119a68de6754c6 SHA256 2f335f234b6e1897f11a09300ee8ba47e940a657a2b2e55b77243b8a8e894ef3
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.4.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.4.ebuild
new file mode 100644
index 0000000..a62fcbf
--- /dev/null
+++ b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.4.ebuild,v 1.5 2009/12/15 15:43:06 armin76 Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="S3 ViRGE video driver"
+KEYWORDS="alpha amd64 ia64 ppc x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild
new file mode 100644
index 0000000..56a4a9a
--- /dev/null
+++ b/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-s3virge/xf86-video-s3virge-1.10.5.ebuild,v 1.4 2012/06/24 19:12:58 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="S3 ViRGE video driver"
+
+KEYWORDS="~alpha amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-savage/Manifest b/x11-drivers/xf86-video-savage/Manifest
new file mode 100644
index 0000000..ae637fb
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-savage-2.3.3.tar.bz2 371252 RMD160 fe33b89eb8627f4f044b386e6d907ac7c36d1533 SHA1 9115b4259842502b42128bf7eb35e7460da51a3a SHA256 d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2
+DIST xf86-video-savage-2.3.4.tar.bz2 392823 RMD160 79af06ad3468dbbd5670502f335c68b96901b2a6 SHA1 e2eb14a6d7dc6a031e22a243afab0181ed9d568d SHA256 3a666a66339686ad4dd85b0665cc300e8a7fc6d38b49a9e8e8d48f393627be49
+EBUILD xf86-video-savage-2.3.3-r1.ebuild 561 RMD160 c430875a1345ebe5a6dc64b7a4f33971be966f2d SHA1 78b150760267fbf6aabd9ed326de002b64596766 SHA256 606c02a65ad3ee20954124730b51d5becd0316486741100bc4a54e7c5c7d4e4f
+EBUILD xf86-video-savage-2.3.4-r1.ebuild 583 RMD160 660e4b9f03b7124cf04069aa7fcdcf75d438175f SHA1 42be3c77707bed6e4411a59f1850f5ea5dc72a88 SHA256 0da56d71f14a1f5b62329cdc3fe8dc4df05a18f452906171df92f2d5c56a051c
+MISC ChangeLog 10461 RMD160 1e9b13bfd33f087226a6d39e04c61ef1d23c8157 SHA1 cb3d13aef078cab88931b74db4b2b410885a0647 SHA256 c3742ae8c5209532a9820ac80cb35d28e9ca34f7c40359569806dbfde6b43450
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3-r1.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3-r1.ebuild
new file mode 100644
index 0000000..f1a7510
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.3-r1.ebuild,v 1.1 2012/06/11 13:08:46 scarabeus Exp $
+
+EAPI="4-slot-abi"
+
+inherit xorg-2
+
+DESCRIPTION="S3 Savage video driver"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
+
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	>=x11-proto/xextproto-7.0.99.1"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+	xorg-2_pkg_setup
+}

diff --git a/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild
new file mode 100644
index 0000000..d300ebb
--- /dev/null
+++ b/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-savage/xf86-video-savage-2.3.4-r1.ebuild,v 1.3 2012/06/24 19:13:33 ago Exp $
+
+EAPI="4-slot-abi"
+XORG_DRI=dri
+inherit xorg-2
+
+DESCRIPTION="S3 Savage video driver"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	>=x11-proto/xextproto-7.0.99.1"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+	xorg-2_pkg_setup
+}

diff --git a/x11-drivers/xf86-video-siliconmotion/Manifest b/x11-drivers/xf86-video-siliconmotion/Manifest
new file mode 100644
index 0000000..a527966
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/Manifest
@@ -0,0 +1,9 @@
+AUX xf86-video-siliconmotion-1.7.5-abi-check.patch 636 RMD160 79d2e6ca02d8140d091a1d7a2a93af98c5869dc9 SHA1 5bc1f0b3a8a06b897d4b6414c6e14c0bf0cf4936 SHA256 133ef1a8710709bebc1129766d7b6ab678ac9f626316c7158161ce3eb594fb05
+AUX xf86-video-siliconmotion-1.7.5-new-vgahw.patch 599 RMD160 19245865605282a9811e3dd9392daa8fcd9b26b1 SHA1 d44cd105c277fd5b95d90dddd18374143ef6c028 SHA256 3ca19cd0a969e53ffc0d921aa1ea9e3c9b65855d14f060cb9beaf0c20948db35
+AUX xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch 747 RMD160 bc7cec5adbaf6bdca4d9481b5b83f3fa32fda0a9 SHA1 50b0e4aa858d7f8eb6f7e826f62fde23f01afe48 SHA256 f3269b52909d398e8f15604a67f328687e50019c1c665dcfa77aad6490472fbf
+DIST xf86-video-siliconmotion-1.7.5.tar.bz2 351610 RMD160 10fc077e41c21f5eaff3603d80a80bfdd500945b SHA1 946acae0822d51da57abe8b7ed049691bd731589 SHA256 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913
+DIST xf86-video-siliconmotion-1.7.6.tar.bz2 385009 RMD160 487ae51e1bd6436675c941a4788d83d39b4e8302 SHA1 b26f149dd7cfc7bb5d18658701b52cd00ffd964d SHA256 a59f1bd21499351b3703c4b77ec007d1299ccb888434d19fabbbeee0a7a14d07
+EBUILD xf86-video-siliconmotion-1.7.5.ebuild 602 RMD160 13b01cd48dbdfb02c7919163137b380e22bf7873 SHA1 8c6da146dc6936eed8b11d2831c873553756e65b SHA256 ce2fcf7dcadb80e88425365055e21a0a049356c7611dc30c1efed061fc3cab9d
+EBUILD xf86-video-siliconmotion-1.7.6.ebuild 462 RMD160 9c6dfe0ef736f981efb54fb8c0b813d0916062ee SHA1 3b6c8f1f16e80b0d9b78a674d5b8b96027dd8e7c SHA256 ee63baf56df7af358dc2ead89ee94807e475bf48dd8ff4577cdaf66bf517d8c5
+MISC ChangeLog 9147 RMD160 308ea66d99e83de116b691838b662d74d2ff1327 SHA1 edf6181307f2af1ebc663ab805b3e2ae372e3b23 SHA256 4ad4fad472844aea9df26c568ce94de39608dbab0ab904e2cb4d132a73a2e7a5
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch
new file mode 100644
index 0000000..7c31166
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch
@@ -0,0 +1,22 @@
+From 7d9c1a49b87df15cdb78c529db554ea82c77033f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@××××××.com>
+Date: Thu, 17 Nov 2011 20:53:51 +0000
+Subject: Check ABI major not encoded ABI
+
+Signed-off-by: Adam Jackson <ajax@××××××.com>
+---
+diff --git a/src/smi_driver.c b/src/smi_driver.c
+index 86644c7..6508fae 100644
+--- a/src/smi_driver.c
++++ b/src/smi_driver.c
+@@ -442,7 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
+ 	    LEAVE(FALSE);
+ 
+ 	hwp = VGAHWPTR(pScrn);
+-#if ABI_VIDEODRV_VERSION < 12
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ 	pSmi->PIOBase = hwp->PIOOffset;
+ #else
+ 	pSmi->PIOBase = 0;
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch
new file mode 100644
index 0000000..f34b1fb
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch
@@ -0,0 +1,21 @@
+From 0e7e9cd639196cb42b0a79b2671f6bacc558035f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@××××××.com>
+Date: Mon, 19 Dec 2011 22:26:34 +0000
+Subject: Fix for new vgaHW ABI
+
+Signed-off-by: Adam Jackson <ajax@××××××.com>
+---
+diff --git a/src/smi_driver.c b/src/smi_driver.c
+index a344921..25eb742 100644
+--- a/src/smi_driver.c
++++ b/src/smi_driver.c
+@@ -442,6 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
+ 	    LEAVE(FALSE);
+ 
+ 	hwp = VGAHWPTR(pScrn);
++	vgaHWSetStdFuncs(hwp);
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ 	pSmi->PIOBase = hwp->PIOOffset;
+ #else
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch
new file mode 100644
index 0000000..ef353f0
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch
@@ -0,0 +1,25 @@
+From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@××××××.com>
+Date: Wed, 16 Nov 2011 20:03:25 +0000
+Subject: Adapt to missing PIOOffset in videoabi 12
+
+Signed-off-by: Adam Jackson <ajax@××××××.com>
+---
+diff --git a/src/smi_driver.c b/src/smi_driver.c
+index 9c10e46..86644c7 100644
+--- a/src/smi_driver.c
++++ b/src/smi_driver.c
+@@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
+ 	    LEAVE(FALSE);
+ 
+ 	hwp = VGAHWPTR(pScrn);
++#if ABI_VIDEODRV_VERSION < 12
+ 	pSmi->PIOBase = hwp->PIOOffset;
++#else
++	pSmi->PIOBase = 0;
++#endif
+ 
+ 	xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, "
+ 		       "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET,
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild
new file mode 100644
index 0000000..c7fbed6
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild,v 1.6 2012/03/18 15:54:44 chithanh Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Silicon Motion video driver"
+
+KEYWORDS="alpha amd64 ia64 ~mips x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.5-xorg-server-1.12.patch
+	"${FILESDIR}"/${PN}-1.7.5-abi-check.patch
+	"${FILESDIR}"/${PN}-1.7.5-new-vgahw.patch
+)

diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild
new file mode 100644
index 0000000..5222c4e
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild,v 1.4 2012/06/24 19:14:00 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Silicon Motion video driver"
+
+KEYWORDS="~alpha amd64 ~ia64 ~mips x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-sis/Manifest b/x11-drivers/xf86-video-sis/Manifest
new file mode 100644
index 0000000..d089215
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-sis-0.10.3.tar.bz2 649750 RMD160 86e82fb72fe0304c4d95399362adf978fe0c1874 SHA1 158673747e240b0c33499685a32d46bdaead7cd5 SHA256 9b39b3e22fd2adab812fea06073c37971c7235c02c7f457bf8b60c1ae351c737
+DIST xf86-video-sis-0.10.4.tar.bz2 701447 RMD160 9c6d4cb8e819798498530ee9b84d239e36c07202 SHA1 e17fabf160939cef3128f4b10f70fd5f9b0e6442 SHA256 4e841080ea524f37d887ef4ee50df5b9f7f5b417abddc9eb8ddad19128c0b10d
+EBUILD xf86-video-sis-0.10.3.ebuild 772 RMD160 a11c0dc05c7f4f78f3b8ecc5aa341b3514f99269 SHA1 4f37de2510026f76674ca87aa3ab528bf71bb235 SHA256 8fe404daa260bd4c4451e938850b21bfe512b98c181e5b34364097260cba7490
+EBUILD xf86-video-sis-0.10.4-r1.ebuild 443 RMD160 914e0688fb0a89949ed0f911551ef1a3e195868f SHA1 67a2e1f63881f0fcae017fb3283e2cd2784ed7d2 SHA256 487a963a9455fdad9a06b45cfe596d15382201706a689a9b3f4a241deb78f9ca
+MISC ChangeLog 8502 RMD160 600e688c6e968c4919d67f4e9ec99f9604c987a9 SHA1 d45f32d3805aba4af8c7361dcfb4b55dabbf21b7 SHA256 5aac11c45db98778a7a2fe43a2e5eb85d31291aa07149e5a3dffb66c4d1f0e82
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.3.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.3.ebuild
new file mode 100644
index 0000000..047b7bf
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.3.ebuild,v 1.6 2011/02/12 19:34:39 armin76 Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="SiS and XGI video driver"
+KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND="dri? ( x11-base/xorg-server[-minimal] )
+	!dri? ( x11-base/xorg-server )
+"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86miscproto
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	dri? (
+		x11-proto/xf86driproto
+		>=x11-libs/libdrm-2
+	)"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild
new file mode 100644
index 0000000..e32c639
--- /dev/null
+++ b/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-sis/xf86-video-sis-0.10.4-r1.ebuild,v 1.3 2012/06/24 19:14:26 ago Exp $
+
+EAPI="4-slot-abi"
+XORG_DRI=dri
+inherit xorg-2
+
+DESCRIPTION="SiS and XGI video driver"
+KEYWORDS="amd64 ~ia64 ~ppc x86 ~x86-fbsd"
+IUSE="dri"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+}

diff --git a/x11-drivers/xf86-video-tdfx/Manifest b/x11-drivers/xf86-video-tdfx/Manifest
new file mode 100644
index 0000000..a8d3fab
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-tdfx-1.4.3.tar.bz2 290172 RMD160 2aaf601c6375f6b37f2a9f65424367fe9e3e6d83 SHA1 d091d3c93b500b361c083bc1b54c4f5d5fac0943 SHA256 3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
+DIST xf86-video-tdfx-1.4.4.tar.bz2 338767 RMD160 fb63b1c331e3192bb6a3820d293a9e8bf9d710c0 SHA1 40cb1395c3af4526819d10d3ef22c52f3a1ad2d2 SHA256 e0b931dea0fb1ebfaa628a3dc07bf6945b377d3f7bbfd3a43ca4c80c46d48f88
+EBUILD xf86-video-tdfx-1.4.3.ebuild 727 RMD160 56846a5273c12d33fa25a37c84b4da6292acda11 SHA1 3ec3928239e159eab232c9347cbd3a8ca587fd3a SHA256 151e50a98c38a75006a297e9212195667a3e6f9ebcc534afa4b7634c67b35899
+EBUILD xf86-video-tdfx-1.4.4-r1.ebuild 513 RMD160 bd9ca932cc9a9053e394212803fa6ccdf84dfa6f SHA1 8d3c4b1b8450fbec5312fd5bf7f8910f0ffbe4ac SHA256 32dc9d735310bcf24c709db244ad35f1a2eb3d64dd8dca287f26e18de35ec73d
+MISC ChangeLog 8424 RMD160 419a14c8125f6a12becc317ee950738db6280271 SHA1 7c99c40599728518fbbb88f4a5af05784af2f141 SHA256 c5233dbe073309330b1baef6df33c4a5595d80ca89109b866ff8d7102ba102ba
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild
new file mode 100644
index 0000000..34c51a9
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild,v 1.5 2009/12/15 15:46:23 armin76 Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=4
+
+inherit x-modular
+
+DESCRIPTION="3Dfx video driver"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2 )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable dri)"
+}

diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild
new file mode 100644
index 0000000..147c927
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.4-r1.ebuild,v 1.3 2012/06/24 19:14:53 ago Exp $
+
+EAPI="4-slot-abi"
+XORG_DRI=dri
+
+inherit xorg-2
+
+DESCRIPTION="3Dfx video driver"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+}

diff --git a/x11-drivers/xf86-video-trident/Manifest b/x11-drivers/xf86-video-trident/Manifest
new file mode 100644
index 0000000..75c14ed
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/Manifest
@@ -0,0 +1,6 @@
+DIST xf86-video-trident-1.3.4.tar.bz2 310898 RMD160 0a1269f029ccc6fc32f28af993ae545f6f22cff9 SHA1 7c40f5c02bddf399862782b708941e79302318af SHA256 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8
+DIST xf86-video-trident-1.3.5.tar.bz2 334649 RMD160 0015441513c62f0404f6352759283fce9e0ee807 SHA1 d4ef8112eeabb7a7e31e287172425e3540bb34fd SHA256 4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b
+EBUILD xf86-video-trident-1.3.4.ebuild 565 RMD160 9da1841057baf6f2dfa5c3398b0e54b211a6cab7 SHA1 0ce75d66e7188e635bbf053571a254b4ed5c5084 SHA256 53581cceb9094c8c5fce441d5d0b701fa0b43be1ad53a3edbbbcf33799195478
+EBUILD xf86-video-trident-1.3.5.ebuild 434 RMD160 7d6f9a4f36aa83a14ce2423abdc9d4a59a8d40e9 SHA1 4dea53369ea7f3a2cac074926b6bc3d032b74396 SHA256 22296aeda0afe5d6ba27ae910cbfd6e25362a99f1634411b957ecfea36965e7d
+MISC ChangeLog 7851 RMD160 5bf5d749d3a4524eff5dbec6184ca5be8afc9760 SHA1 f8380875d58e1167a9a7f8c01aaccf27a29fe37d SHA256 67f7cf535a11afa1987cec600c19ddc386cfe3bac3a6d09d07ea88d7d75d0c8f
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild
new file mode 100644
index 0000000..c653e54
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild,v 1.5 2011/02/12 19:36:37 armin76 Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="Trident video driver"
+KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86dgaproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild
new file mode 100644
index 0000000..a9d35ba
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.5.ebuild,v 1.4 2012/06/24 19:15:21 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Trident video driver"
+KEYWORDS="amd64 ~ia64 ~ppc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-vesa/Manifest b/x11-drivers/xf86-video-vesa/Manifest
new file mode 100644
index 0000000..b0db1d5
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -0,0 +1,9 @@
+AUX xf86-video-vesa-2.3.0-pci-domains.patch 2083 RMD160 40d68ce41b890cf90d18cefb826749e1fe5e6744 SHA1 d97fc7e5a81afb5530a02aba18691c6690a750e5 SHA256 eae65b6b852cb498557c5fab1231522ae7b1f1a955d5374f338e1e4763088c6a
+AUX xf86-video-vesa-2.3.0-xorg-server-1.12.patch 899 RMD160 050aeecf66b6bd997a798b4ad5aa010646a165be SHA1 79464ccc7e443757e62ff6c1f3447bb47f432396 SHA256 cfc8b35a0fa674ab99e3d77f19e53884c882a842c6fe1dbf40a19761ddb9686a
+DIST xf86-video-vesa-2.3.0.tar.bz2 264539 RMD160 7e7c11f6cc094bb898c57d26a70f6c4c0ab83d0f SHA1 4689b7c295d7a8d7326302dafecb812739617134 SHA256 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
+DIST xf86-video-vesa-2.3.1.tar.bz2 287818 RMD160 bf78bba48288ed82881b2593edf848d510b35a58 SHA1 acb4f8104f16476d46ceb366aa932783c3644ead SHA256 e4a1038d5bc8884de461737f68f963651ef91137976388e1db4efc3991d01573
+EBUILD xf86-video-vesa-2.3.0-r1.ebuild 544 RMD160 8da028b03267d49df4c43453c621957823e968aa SHA1 937be23d18991aefe405ebb0e5f48072a284d1f0 SHA256 61c68773f58cc354c36a0a30516b4f75db8f763d2c5c022c2a7e3a6bfe536710
+EBUILD xf86-video-vesa-2.3.0.ebuild 510 RMD160 7908f44d708d3ea7c91098cef6f2a61005de05d5 SHA1 5b40417da45f40928e643a7d2519bee56991cacd SHA256 2a74744da9b0adaa126123c52057457e6980e6b7b77f3c2ec93b136959c7172c
+EBUILD xf86-video-vesa-2.3.1.ebuild 438 RMD160 6363d2a1c154a7aefacea20caf0cae54d07f26c7 SHA1 d876fe113ec17fdf9c36fbe264781ee9686a34f2 SHA256 d576704329503c92631ca91d2a4394aee14ff408383efcb0cb3985cdcec0c6d4
+MISC ChangeLog 8156 RMD160 16c6fb5b6e74c3a91e74068b01a52930f8157501 SHA1 12ef70213036bd87c4a4ca9eb5149bd8fd33993f SHA256 b2463b8b14b59fd49e7d2f7d749da1046bdee2a49b668ba6d87d2296d21ecede
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch
new file mode 100644
index 0000000..645fbc1
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch
@@ -0,0 +1,55 @@
+From 1f84310ddf49778f776a39810aa98211c812e8ab Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@×××××.com>
+Date: Wed, 19 Oct 2011 08:33:07 +0000
+Subject: Build fix for ABI Version 12
+
+ABI Version 12 removes support for multiple PCI domains.  If you need to
+use this driver on a system with more than one PCI domain, you should
+either port this driver to using libpciaccess directly or stick with an
+older server.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@×××××.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 1136ac3..5a0120c 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
+ 				    & pVesa->base);
+     }
+     else
+-	pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo,
+-					  pScrn->memPhysBase, pVesa->mapSize);
++	(void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
++	                             pVesa->mapSize,
++	                             PCI_DEV_MAP_FLAG_WRITABLE,
++	                             & pVesa->base);
+ 
+     if (pVesa->base) {
+ 	if (pVesa->mapPhys != 0xa0000)
+-	    pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0,
+-						 pVesa->pciInfo,
+-						 0xa0000, 0x10000);
++	    (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
++	                                 PCI_DEV_MAP_FLAG_WRITABLE,
++	                                 & pVesa->VGAbase);
+ 	else
+ 	    pVesa->VGAbase = pVesa->base;
+ 
+@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn)
+     if (pVesa->mapPhys != 0xa0000) {
+ 	(void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base,
+ 				      pVesa->mapSize);
+-	xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000);
++	(void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase,
++	                               0x10000);
+     }
+     else {
+-	xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
++	(void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base,
++	                               pVesa->mapSize);
+     }
+ #else
+     xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch
new file mode 100644
index 0000000..697dc27
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch
@@ -0,0 +1,30 @@
+From 463886df688d3521afc47ec88f9aaf67e924ec7f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@×××××.com>
+Date: Wed, 19 Oct 2011 08:15:03 +0000
+Subject: Build fix for ABI Version 12
+
+ABI Version 12 removes support for multiple PCI domains.  If you need to
+use this driver on a system with more than one PCI domain, you should
+either port this driver to using libpciaccess directly or stick with an
+older server.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@×××××.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 61d3550..1136ac3 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -1299,7 +1299,11 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
+     }
+ #endif
+ 
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+     pVesa->ioBase = pScrn->domainIOBase;
++#else
++    pVesa->ioBase = 0;
++#endif
+ 
+     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
+ 		   "virtual address = %p,\n"
+--
+cgit v0.9.0.2-2-gbebe

diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild
new file mode 100644
index 0000000..080a0e8
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild,v 1.1 2012/03/18 16:08:30 chithanh Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Generic VESA video driver"
+KEYWORDS="-* ~alpha ~amd64 ~ia64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-xorg-server-1.12.patch
+	"${FILESDIR}"/${PN}-2.3.0-pci-domains.patch
+)

diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild
new file mode 100644
index 0000000..7c940a6
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild,v 1.5 2011/02/12 19:38:13 armin76 Exp $
+
+inherit x-modular
+
+DESCRIPTION="Generic VESA video driver"
+KEYWORDS="-* alpha amd64 ia64 x86 ~x86-fbsd"
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild
new file mode 100644
index 0000000..d2ba491
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild,v 1.4 2012/06/24 19:15:49 ago Exp $
+
+EAPI="4-slot-abi"
+inherit xorg-2
+
+DESCRIPTION="Generic VESA video driver"
+KEYWORDS="-* ~alpha amd64 ~ia64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-vmware/Manifest b/x11-drivers/xf86-video-vmware/Manifest
new file mode 100644
index 0000000..000670d
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/Manifest
@@ -0,0 +1,12 @@
+DIST xf86-video-vmware-11.0.3.tar.bz2 313656 RMD160 73b9ee26a35bba45e6e70907c882fa5dfba56151 SHA1 8aa23618a3dfa91f88094a4d1dc45c878f386f69 SHA256 b24a7cb2d87e416561e25122eab2cd48fc64a2ba105238456eefef16f29f38a3
+DIST xf86-video-vmware-11.1.0.tar.bz2 336334 RMD160 8a099e75760a856299f4ec7964a0cf4e29d5fa01 SHA1 beffdb52067de690dd0342b7c89ec45024c0292c SHA256 c97503e97f741e64b57ee0e4399323f9c0151fffa55e6f4b90f04f5921b9406a
+DIST xf86-video-vmware-12.0.0.tar.bz2 351064 RMD160 e6fa9c625380acf03bb50e416ab48766b0342a8a SHA1 a0dc242481452ed69a5406b146827f4946c94316 SHA256 0319f261a8f8e7694dfafa7fcdfbe1db73143e2401b155e1fddf5a1770db92c2
+DIST xf86-video-vmware-12.0.1.tar.bz2 431828 RMD160 aa4ed12493104b275ef7ac2c4f727d9fefe9bb8f SHA1 761a55b41b9e496a0887dfe4a9ade6aeacd2371d SHA256 ded644af1f74ca0ebdc759e3db715519c476b341c1783c3d92c93a76591ed496
+DIST xf86-video-vmware-12.0.2.tar.bz2 432468 RMD160 3324f164139c542fbd304ae627d467fea7f5d6bf SHA1 efa47f365d88da245804a9934719ff860ed04f95 SHA256 c827875fd94805ec9b925fe09aaa973e7e3f9096c7ef311d449c3f134ae75147
+EBUILD xf86-video-vmware-11.0.3.ebuild 572 RMD160 9d35e1573f4e0f67131377645651a9b24bc2c422 SHA1 c992c54d048537c1badaf9f8b0819c9fa4949d8d SHA256 e5d2bd24f6e8a9ac543d7a7d01d4b35ec089a71e1ac50c0635ba19ead9a386bc
+EBUILD xf86-video-vmware-11.1.0.ebuild 451 RMD160 29223edf3133ed252943b4ce6d112dd6ff98eef8 SHA1 2b60e3a097d4e7851cadaaf9dee2c2bc842dafc1 SHA256 bf06605d7f8b3aa9d9040716244de756e982b84f8b428a1d4915680cad10f7cb
+EBUILD xf86-video-vmware-12.0.0.ebuild 451 RMD160 edd12179b1693e5f2a44e0bf9cf51445b8c73102 SHA1 f3c09f3832da4cd0618510fc7fdd164edb32ce40 SHA256 9cbac55aff0c9503d9cf4b491d35afb934886aa116ffa475381336b3a65fd69f
+EBUILD xf86-video-vmware-12.0.1.ebuild 472 RMD160 baddf58f66b95cd21d6d4c92eada096161bdfeb9 SHA1 ee660997098e6410e00094356a24eb4192434421 SHA256 48552146b2726cb17c5c5c7b0182f9f76dc4cbcabb2354859ae61970d5dacc8d
+EBUILD xf86-video-vmware-12.0.2.ebuild 465 RMD160 dcbd46d50204718377980e9a2e056a89d41b45e4 SHA1 4f2f26cb20239c842a823948bba63c135410e4fe SHA256 112acd1442d86ed1f2a43253644e1269e2479ca26cb6c9edd9d1ae0952008cfa
+MISC ChangeLog 9990 RMD160 94d8e1219ce8a56c6bb24ef18cfa9d7396556fcb SHA1 61e960e88ad3db2c8b592e18ef2f5c552f6b1ab2 SHA256 cb598c7aff4826fd4f47414b80337c3ca4358a644c1edb5c78d3b99720659f54
+MISC metadata.xml 254 RMD160 c918c791107bb6bade5533be97fda2a5357ade13 SHA1 c0bf2ca0f6107fdce02502942d7050d84ad30fb2 SHA256 32d68d1ad2e14d3f3af865dce8b2e42fec8722f17b1b35beeb5ecbd9b8e1a253

diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.0.3.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.0.3.ebuild
new file mode 100644
index 0000000..eb2017b
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.0.3.ebuild,v 1.3 2010/12/25 20:23:38 fauli Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="VMware SVGA video driver"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server
+	x11-libs/libdrm[libkms,video_cards_vmware]"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto"

diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.1.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.1.0.ebuild
new file mode 100644
index 0000000..a8ad6bb
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-11.1.0.ebuild,v 1.1 2012/01/16 00:59:56 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="VMware SVGA video driver"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.0.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.0.ebuild
new file mode 100644
index 0000000..a1706b2
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.0.ebuild,v 1.1 2012/03/09 00:05:52 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="VMware SVGA video driver"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.1.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.1.ebuild
new file mode 100644
index 0000000..7632295
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.1.ebuild,v 1.1 2012/03/14 17:06:15 chithanh Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="VMware SVGA video driver"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
+	media-libs/mesa[xa]"
+DEPEND="${RDEPEND}"

diff --git a/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild
new file mode 100644
index 0000000..5764125
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vmware/xf86-video-vmware-12.0.2.ebuild,v 1.3 2012/06/24 19:16:15 ago Exp $
+
+EAPI="4-slot-abi"
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="VMware SVGA video driver"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[libkms,video_cards_vmware]
+	media-libs/mesa[xa]"
+DEPEND="${RDEPEND}"

diff --git a/x11-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
index 69cb081..839e47c 100644
--- a/x11-libs/libXmu/Manifest
+++ b/x11-libs/libXmu/Manifest
@@ -1,6 +1,6 @@
 DIST libXmu-1.1.0.tar.bz2 360663 RMD160 e6ca19dfb86a3532faa6e37c8a5cd6edff6a1c62 SHA1 81876a0848070bfc4476a2538fc16898eb6d96cd SHA256 0fa91f303b70decc1ef6201c88c8a5f0b4ecd68c6c88bdcc891ecd1a689d36ad
 DIST libXmu-1.1.1.tar.bz2 383473 RMD160 9b04624ee16ebd10c07b9554771e18d16d77374f SHA1 3e280aa927d78c05f94db6c7ae606f7ad132b495 SHA256 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd
 EBUILD libXmu-1.1.0.ebuild 815 RMD160 795fea1050d7495aeb489ed69988969939d96346 SHA1 8fa7e7d5516685b9d30c4ca7a5ef658f796aa1cc SHA256 d5f30c23e30bf136fab4e2f2e7586c5bee26a958de22af83c800a59c4ae04282
-EBUILD libXmu-1.1.1.ebuild 836 RMD160 bc8e876a32588eaaa3d9150e2d49d09b33c04110 SHA1 b380a5d3952b96bc1840e650e68fc770048ab44b SHA256 9ee95fb9139e78fa0a43e15e1b79401b2018ae9d3e1c8790d34171f2e398ba58
-MISC ChangeLog 8349 RMD160 96e85520e42531a333c4235140379b8fbcbe1285 SHA1 eaf816eaa4cfed5c1ea39f6dc125c17c56180a56 SHA256 fbd187709dd0945566428109345be5ca52ab5a8ac6636ec7ae59fea375ee9597
+EBUILD libXmu-1.1.1.ebuild 838 RMD160 54e4bd6360ffa401943704b0ae3c6b10f92aad31 SHA1 6f8d034f9d7be91a1041fff0c4b813d6c2bf2588 SHA256 6e1c2dbf6a38b284ad27d66aa58cd5802cd0d747922a9bd8ccb328dc7489733b
+MISC ChangeLog 8448 RMD160 4938ef3e619aba3c930bbf94f480d390ba7644a5 SHA1 0fc0de9e696d5e6c0b8f87d06f041283de6b16d7 SHA256 ff48a83416fb14c2cf113d020c24b9e60c3a5882e9fcf939f3b515cde8715832
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
index 0b148c3..4619048 100644
--- a/x11-libs/libXmu/libXmu-1.1.1.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.5 2012/06/28 15:03:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.1.ebuild,v 1.6 2012/06/29 05:01:14 maekke Exp $
 
 EAPI="4-slot-abi"
 
@@ -9,7 +9,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org Xmu library"
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ipv6"
 
 RDEPEND="x11-libs/libXt

diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
index a395416..19e0757 100644
--- a/x11-libs/xcb-util/Manifest
+++ b/x11-libs/xcb-util/Manifest
@@ -2,7 +2,7 @@ DIST xcb-util-0.3.6.tar.bz2 293408 RMD160 853e53493c67d56a4ce368cc6b9512c247fc84
 DIST xcb-util-0.3.8.tar.bz2 266339 RMD160 d3d37bc6612a3e32e26f9f8c966d156730970e9c SHA1 71093ad81feb21758a2446cf3297bebaf03af228 SHA256 c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9
 DIST xcb-util-0.3.9.tar.bz2 287855 RMD160 949b2d8666914185b106c2d0bafb4c625cd450c6 SHA1 02060d8e2e70838fc41cd3a27c7f2909090d8c20 SHA256 c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4
 EBUILD xcb-util-0.3.6.ebuild 1150 RMD160 14bdd6d130289d12a398a02019feea8f4f0e90b7 SHA1 edf3d20c3ce7f89214f3665a8a7a2a3e704ec985 SHA256 50c131db802b64dc5d34d869a4d9d14f44161613afa7d3c82a35ff7c2c75590d
-EBUILD xcb-util-0.3.8.ebuild 1125 RMD160 f75531540e1ef5c76f49b8d6ea456405d36e61fa SHA1 bb85a3d61fa0fabd899a10ec76e32605a234d977 SHA256 1c020a95180b68f9d48e553b08a2da6b2a159271e2809c363e269c0f606247cd
-EBUILD xcb-util-0.3.9.ebuild 1127 RMD160 89c6b2545b1152437536c57ea7c903c2dcf41920 SHA1 d21475cc858178ab5b6d1147b4e2945623586a74 SHA256 dc006e79a05a4813459f47d4ec353994545e8e295642027ac8e5adc90651eeff
-MISC ChangeLog 7878 RMD160 94186e94c5cd5018c88e6a0af23d095b7c258032 SHA1 6ba6f06b431df40c6107e55d9fd611021e633b3b SHA256 536bc69ffb4170355ceb8ed3309299eeb14a5c4cb1ec5555a4575c663cf7240a
+EBUILD xcb-util-0.3.8.ebuild 1121 RMD160 358679a5b64c4940926055ad79515e63c50cdad3 SHA1 d5f3a1242f19caae047189d8102d5ea65376280a SHA256 8417fdfa327aabc07c85d334b2412da3f67b1ebd2322a3d7262c02f4bed6df0e
+EBUILD xcb-util-0.3.9.ebuild 1129 RMD160 1ab7b77c37e9b74a65e68a16f6d9f9efc9088efa SHA1 f93a790ed097f2e1cdf36ca78299a20df9fe3650 SHA256 435b25cc736d52ebe6f575a84883cd325e79843d84a485575b7a65daa154736c
+MISC ChangeLog 7979 RMD160 432703cd5521427eb9189a63fc1ba10214b6a311 SHA1 d64502c39d5f85c43c6da79712e11900a65ba959 SHA256 0f3ec17d274e8ef9a29833fd616f8ff37de3cad5b43d1658c5774e03f334d3ef
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055

diff --git a/x11-libs/xcb-util/xcb-util-0.3.8.ebuild b/x11-libs/xcb-util/xcb-util-0.3.8.ebuild
index e89d3df..b94339d 100644
--- a/x11-libs/xcb-util/xcb-util-0.3.8.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.3.8.ebuild
@@ -26,10 +26,10 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-libs/check-0.9.4 )"
 
 PDEPEND="
-	>=x11-libs/xcb-util-image-${PV}
-	>=x11-libs/xcb-util-keysyms-${PV}
-	>=x11-libs/xcb-util-renderutil-${PV}
-	>=x11-libs/xcb-util-wm-${PV}
+	~x11-libs/xcb-util-image-${PV}
+	~x11-libs/xcb-util-keysyms-${PV}
+	~x11-libs/xcb-util-renderutil-${PV}
+	~x11-libs/xcb-util-wm-${PV}
 "
 
 pkg_setup() {

diff --git a/x11-libs/xcb-util/xcb-util-0.3.9.ebuild b/x11-libs/xcb-util/xcb-util-0.3.9.ebuild
index bd269fc..c628b12 100644
--- a/x11-libs/xcb-util/xcb-util-0.3.9.ebuild
+++ b/x11-libs/xcb-util/xcb-util-0.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.3.9.ebuild,v 1.4 2012/06/28 15:15:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xcb-util/xcb-util-0.3.9.ebuild,v 1.5 2012/06/29 17:48:46 maekke Exp $
 
 EAPI="4-slot-abi"
 
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
 DESCRIPTION="X C-language Bindings sample implementations"
 HOMEPAGE="http://xcb.freedesktop.org/"
 SLOT="0/1.0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="test"
 
 RDEPEND=">=x11-libs/libxcb-1.7