x11-drivers/xf86-video-intel: start the pkgmove

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64, RepoMan options: --force)

20 files changed, 1405 insertions, 0 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
new file mode 100644
index 000000000000..0b6f08e9a393
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -0,0 +1,695 @@
+# ChangeLog for x11-drivers/xf86-video-i810
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+*xf86-video-intel-2.4.98.0 (22 Oct 2008)
+*xf86-video-intel-2.4.2-r3 (22 Oct 2008)
+*xf86-video-intel-2.4.2-r2 (22 Oct 2008)
+*xf86-video-intel-2.3.2 (22 Oct 2008)
+*xf86-video-intel-2.2.1 (22 Oct 2008)
+*xf86-video-intel-2.2.0.90 (22 Oct 2008)
+*xf86-video-intel-2.1.1 (22 Oct 2008)
+*xf86-video-intel-1.7.4 (22 Oct 2008)
+*xf86-video-intel-1.6.5 (22 Oct 2008)
+
+  22 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/1.6.5-fix_no_dri.patch,
+  +files/2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch,
+  +files/2.2.1-0001-fixup-pciaccess-version-detect.patch,
+  +files/2.4.2-0002-Disable-render-standby.patch,
+  +files/2.1.1-fix_build_without_dri.patch,
+  +files/2.3.2-0001-intel-fix-drm-check.patch,
+  +files/2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch,
+  +files/i810.xinf, +metadata.xml, +xf86-video-intel-1.6.5.ebuild,
+  +xf86-video-intel-1.7.4.ebuild, +xf86-video-intel-2.1.1.ebuild,
+  +xf86-video-intel-2.2.0.90.ebuild, +xf86-video-intel-2.2.1.ebuild,
+  +xf86-video-intel-2.3.2.ebuild, +xf86-video-intel-2.4.2-r2.ebuild,
+  +xf86-video-intel-2.4.2-r3.ebuild, +xf86-video-intel-2.4.98.0.ebuild:
+  start the pkgmove
+
+*xf86-video-i810-2.4.98.0 (19 Oct 2008)
+
+  19 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.4.98.0.ebuild:
+  bump to 2.4.98.0 (release candidate)
+
+  19 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  -files/xf86-video-i810-2.4.1-0001-Fix-reverted-LVDS-bios-capability-dword-
+  definition.patch, -xf86-video-i810-2.4.0.ebuild,
+  -xf86-video-i810-2.4.1.ebuild, -xf86-video-i810-2.4.1-r1.ebuild,
+  -xf86-video-i810-2.4.2.ebuild, -xf86-video-i810-2.4.2-r1.ebuild:
+  remove old cruft
+
+*xf86-video-i810-2.4.2-r3 (19 Oct 2008)
+
+  19 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch
+  , +xf86-video-i810-2.4.2-r3.ebuild:
+  add patch for libdrm 2.4.0 support
+
+*xf86-video-i810-2.4.2-r2 (30 Sep 2008)
+
+  30 Sep 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detect
+  ion.patch, +files/xf86-video-i810-2.4.2-0002-Disable-render-standby.patch,
+  -files/xf86-video-i810-2.4.2-fix-flicker.patch,
+  xf86-video-i810-2.4.2-r1.ebuild, +xf86-video-i810-2.4.2-r2.ebuild:
+  add another patch from upstream's 2.4-branch
+
+*xf86-video-i810-2.4.2-r1 (02 Sep 2008)
+
+  02 Sep 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.4.2-fix-flicker.patch,
+  +xf86-video-i810-2.4.2-r1.ebuild:
+  add patch to try to fix flickering
+
+*xf86-video-i810-2.4.2 (29 Aug 2008)
+
+  29 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.4.2.ebuild:
+  bump to 2.4.2
+
+  29 Aug 2008; Rémi Cardona <remi@gentoo.org> metadata.xml:
+  reassigning to x11 as I'm on the team now
+
+*xf86-video-i810-2.4.1-r1 (19 Aug 2008)
+
+  19 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.4.1-0001-Fix-reverted-LVDS-bios-capability-dword-
+  definition.patch, +xf86-video-i810-2.4.1-r1.ebuild:
+  add a fix for LFP dithering
+
+  19 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  -files/2.4.0/0007-Disable-display-clock-gating-for-4-series-chips.patch,
+  -files/2.4.0/0001-Update-DSPARB-while-planes-are-still-off.patch,
+  -files/2.4.0/0002-Reorder-visuals-reported-by-the-intel-driver.patch,
+  -files/2.4.0/0003-Don-t-program-dsparb-on-new-Intel-chip.patch,
+  -files/2.4.0/0004-Fix-SDVO-reg-definition.patch,
+  -files/2.4.0/0005-Fix-up-the-HP-Pavilion-ze4944ea-quirk.patch,
+  -files/2.4.0/0008-Fix-possible-spurious-interrupts-in-hotplug-detect-o.pat
+  ch, -files/2.4.0/0006-Fix-SDVO-HDMI-encoding-detect-16920.patch,
+  -xf86-video-i810-2.4.0-r1.ebuild:
+  remove 2.4.0-r1
+
+*xf86-video-i810-2.4.1 (18 Aug 2008)
+
+  18 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.4.1.ebuild:
+  bump to 2.4.1
+
+  11 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  -files/2.3.1/0001-Skip-copying-on-FOURCC_XVMC-surfaces.patch,
+  -files/2.3.1/0002-Only-use-FOURCC_XVMC-when-INTEL_XVMC-is-defined.patch,
+  -files/2.3.1/0003-Panel-fitting-fix-letterbox-modes.patch,
+  -files/2.3.1/0004-Add-glproto-to-DRI-dependencies.patch,
+  -files/2.3.1/0005-Revert-Add-FIFO-watermark-regs-to-register-dumper.patch,
+  -files/2.3.1/0006-Fix-typo-in-xvmc-block-destroy.patch,
+  -files/2.3.1/0007-Define-DEFFILEMODE-for-OS-es-that-don-t-have-it.patch,
+  -files/2.3.1/0008-Disable-a-bunch-of-clock-gating-disables-on-IGD_GM.patch
+  , -files/2.3.1/0009-Fixup-power-saving-registers.patch,
+  -files/2.3.1/0010-xvmc-remove-unused-dri-drawable.patch,
+  -files/2.3.1/0011-xvmc-a-little-cleanup.patch,
+  -files/2.3.1/0012-Set-SDVO-sync-polarity-to-default-on-965.patch,
+  -files/2.3.1/0013-Just-remove-the-mprotect-kludge.patch,
+  -files/2.3.1/0014-Replace-a-couple-of-wait-for-ring-idles-with-a-singl.pat
+  ch,
+  -files/2.3.1/0015-Remove-duplicated-i830_stop_ring-SetHWOperatingSta.patch
+  ,
+  -files/2.3.1/0016-Remove-gratuitous-wait_ring_idle-after-I830Sync.-Sy.patc
+  h,
+  -files/2.3.1/0017-Move-BIOS-scratch-register-setup-to-EnterVT-instead.patc
+  h,
+  -files/2.3.1/0018-Initialize-clock-gating-from-EnterVT-and-save-restor.pat
+  ch, -files/2.3.1/0019-Remove-SVG_WORK_CONTROL-init.patch,
+  -files/2.3.1/0020-Move-debug-clock-printout-from-ErrorF-to-X_INFO.patch,
+  -files/2.3.1/0021-Fix-TV-out-connection-type-detection.patch,
+  -files/2.3.1/0022-Fix-TV-programming-add-vblank-wait-after-TV_CTL-wr.patch
+  , -files/2.3.1/0023-Two-more-Dell-quirks.patch,
+  -files/2.3.1/0024-Set-up-restore-PWRCTXA-from-enter-leavevt-not-server.pat
+  ch, -files/2.3.1/0025-Fix-compiler-warning-when-disable-xvmc-config.patch:
+  clean up unused patches
+
+*xf86-video-i810-2.4.0-r1 (11 Aug 2008)
+
+  11 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  +files/2.4.0/0007-Disable-display-clock-gating-for-4-series-chips.patch,
+  +files/2.4.0/0001-Update-DSPARB-while-planes-are-still-off.patch,
+  +files/2.4.0/0002-Reorder-visuals-reported-by-the-intel-driver.patch,
+  +files/2.4.0/0003-Don-t-program-dsparb-on-new-Intel-chip.patch,
+  +files/2.4.0/0004-Fix-SDVO-reg-definition.patch,
+  +files/2.4.0/0005-Fix-up-the-HP-Pavilion-ze4944ea-quirk.patch,
+  +files/2.4.0/0008-Fix-possible-spurious-interrupts-in-hotplug-detect-o.pat
+  ch, +files/2.4.0/0006-Fix-SDVO-HDMI-encoding-detect-16920.patch,
+  +xf86-video-i810-2.4.0-r1.ebuild:
+  add patches from the upcoming 2.4.1
+
+*xf86-video-i810-2.4.0 (03 Aug 2008)
+
+  03 Aug 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.4.0.ebuild:
+  bump to 2.4.0, see bug #232908
+
+  02 Jul 2008; Rémi Cardona <remi@gentoo.org>
+  -xf86-video-i810-2.3.0.ebuild, -xf86-video-i810-2.3.1.ebuild,
+  -xf86-video-i810-2.3.1-r1.ebuild, -xf86-video-i810-2.3.1-r2.ebuild:
+  clean up old releases
+
+  01 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0001-intel-fix-drm-check.patch, xf86-video-i810-2.3.1-r2.ebuild,
+  xf86-video-i810-2.3.2.ebuild:
+  (#227389) Fix building against released DRM versions. Don't assume libdrm
+  2.3.1 has TTM support, push that to 2.4.0 instead.
+
+*xf86-video-i810-2.3.2 (18 Jun 2008)
+
+  18 Jun 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.3.2.ebuild:
+  bump to 2.3.2
+
+*xf86-video-i810-2.3.1-r2 (13 Jun 2008)
+
+  13 Jun 2008; Rémi Cardona <remi@gentoo.org>
+  files/2.3.1/0001-Skip-copying-on-FOURCC_XVMC-surfaces.patch,
+  files/2.3.1/0002-Only-use-FOURCC_XVMC-when-INTEL_XVMC-is-defined.patch,
+  files/2.3.1/0003-Panel-fitting-fix-letterbox-modes.patch,
+  files/2.3.1/0004-Add-glproto-to-DRI-dependencies.patch,
+  files/2.3.1/0005-Revert-Add-FIFO-watermark-regs-to-register-dumper.patch,
+  +files/2.3.1/0006-Fix-typo-in-xvmc-block-destroy.patch,
+  +files/2.3.1/0007-Define-DEFFILEMODE-for-OS-es-that-don-t-have-it.patch,
+  +files/2.3.1/0008-Disable-a-bunch-of-clock-gating-disables-on-IGD_GM.patch
+  , +files/2.3.1/0009-Fixup-power-saving-registers.patch,
+  +files/2.3.1/0010-xvmc-remove-unused-dri-drawable.patch,
+  +files/2.3.1/0011-xvmc-a-little-cleanup.patch,
+  +files/2.3.1/0012-Set-SDVO-sync-polarity-to-default-on-965.patch,
+  +files/2.3.1/0013-Just-remove-the-mprotect-kludge.patch,
+  +files/2.3.1/0014-Replace-a-couple-of-wait-for-ring-idles-with-a-singl.pat
+  ch,
+  +files/2.3.1/0015-Remove-duplicated-i830_stop_ring-SetHWOperatingSta.patch
+  ,
+  +files/2.3.1/0016-Remove-gratuitous-wait_ring_idle-after-I830Sync.-Sy.patc
+  h,
+  +files/2.3.1/0017-Move-BIOS-scratch-register-setup-to-EnterVT-instead.patc
+  h,
+  +files/2.3.1/0018-Initialize-clock-gating-from-EnterVT-and-save-restor.pat
+  ch, +files/2.3.1/0019-Remove-SVG_WORK_CONTROL-init.patch,
+  +files/2.3.1/0020-Move-debug-clock-printout-from-ErrorF-to-X_INFO.patch,
+  +files/2.3.1/0021-Fix-TV-out-connection-type-detection.patch,
+  +files/2.3.1/0022-Fix-TV-programming-add-vblank-wait-after-TV_CTL-wr.patch
+  , +files/2.3.1/0023-Two-more-Dell-quirks.patch,
+  +files/2.3.1/0024-Set-up-restore-PWRCTXA-from-enter-leavevt-not-server.pat
+  ch, +files/2.3.1/0025-Fix-compiler-warning-when-disable-xvmc-config.patch,
+  +xf86-video-i810-2.3.1-r2.ebuild:
+  add patches from the upcoming 2.3.2 release
+
+*xf86-video-i810-2.3.1-r1 (22 May 2008)
+
+  22 May 2008; Rémi Cardona <remi@gentoo.org>
+  +files/2.3.1/0001-Skip-copying-on-FOURCC_XVMC-surfaces.patch,
+  +files/2.3.1/0002-Only-use-FOURCC_XVMC-when-INTEL_XVMC-is-defined.patch,
+  +files/2.3.1/0003-Panel-fitting-fix-letterbox-modes.patch,
+  +files/2.3.1/0004-Add-glproto-to-DRI-dependencies.patch,
+  +files/2.3.1/0005-Revert-Add-FIFO-watermark-regs-to-register-dumper.patch,
+  +xf86-video-i810-2.3.1-r1.ebuild:
+  Add a few patches from the xf86-video-intel-2.3-branch, containing a fix
+  for bug #222981
+
+  20 May 2008; Rémi Cardona <remi@gentoo.org> xf86-video-i810-1.6.5.ebuild,
+  xf86-video-i810-2.2.1.ebuild:
+  make repoman happy, use bash arrays for PATCHES
+
+  20 May 2008; Rémi Cardona <remi@gentoo.org> xf86-video-i810-2.1.1.ebuild:
+  use eclass variables rather than hand-crafted src_unpack, fixes bug
+  #221121
+
+*xf86-video-i810-2.3.1 (20 May 2008)
+
+  20 May 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.3.1.ebuild:
+  bump to 2.3.1, bugfix release
+
+  14 May 2008; Rémi Cardona <remi@gentoo.org> xf86-video-i810-2.1.1.ebuild,
+  xf86-video-i810-2.2.0.90.ebuild, xf86-video-i810-2.2.1.ebuild,
+  xf86-video-i810-2.3.0.ebuild:
+  add glproto dep, see bug #205689
+
+  14 May 2008; Rémi Cardona <remi@gentoo.org>
+  -files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patc
+  h, -files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch,
+  -xf86-video-i810-2.2.99.901.ebuild, -xf86-video-i810-2.2.99.902.ebuild,
+  -xf86-video-i810-2.2.99.903.ebuild, -xf86-video-i810-2.2.99.903-r1.ebuild:
+  remove 2.3 release candidates and patches
+
+*xf86-video-i810-2.3.0 (29 Apr 2008)
+
+  29 Apr 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.3.0.ebuild:
+  Bump to 2.3.0
+
+*xf86-video-i810-2.2.99.903-r1 (18 Apr 2008)
+
+  18 Apr 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch,
+  +xf86-video-i810-2.2.99.903-r1.ebuild:
+  Add patches to fix non-native resolution on i8xx-attached LFP displays
+
+*xf86-video-i810-2.2.99.903 (14 Apr 2008)
+
+  14 Apr 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.2.99.903.ebuild:
+  Bump to 2.2.99.903
+
+*xf86-video-i810-2.2.99.902 (06 Apr 2008)
+
+  06 Apr 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patc
+  h, +xf86-video-i810-2.2.99.902.ebuild:
+  bump to 2.2.99.902 with patch to fix LFP bug on i855
+
+*xf86-video-i810-2.2.99.901 (28 Mar 2008)
+
+  28 Mar 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.2.99.901.ebuild:
+  Bump to 2.2.99.901, RC1 for 2.3
+
+  15 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/0001-fixup-pciaccess-version-detect.patch,
+  xf86-video-i810-2.2.1.ebuild:
+  Detect libpciaccess correctly to fix build with 1.5 servers.
+
+*xf86-video-i810-2.2.1 (27 Feb 2008)
+
+  27 Feb 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.2.1.ebuild:
+  bump to 2.2.1
+
+  24 Feb 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog:
+  Update my email.
+
+  20 Feb 2008; Rémi Cardona <remi@gentoo.org>
+  -files/1.7.0-fix_vt_switch.patch, -files/fix_965_xv.patch,
+  -files/xf86-video-i810-2.2.0-fix_xv_segfault.patch,
+  -xf86-video-i810-2.2.1_pre20080125.ebuild:
+  remove outdated snapshot and useless patches
+
+*xf86-video-i810-2.2.0.90 (06 Feb 2008)
+
+  06 Feb 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.2.0.90.ebuild:
+  Bump to 2.2.0.90 (release candidate)
+
+  01 Feb 2008; Rémi Cardona <remi@gentoo.org>
+  -xf86-video-i810-2.0.0.ebuild, -xf86-video-i810-2.1.0.ebuild,
+  -xf86-video-i810-2.2.0-r1.ebuild,
+  -xf86-video-i810-2.2.1_pre20080123.ebuild:
+  Pruning old or broken versions
+
+*xf86-video-i810-2.2.1_pre20080125 (25 Jan 2008)
+
+  25 Jan 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.2.1_pre20080125.ebuild:
+  Add another home made snapshot
+
+*xf86-video-i810-2.2.1_pre20080123 (24 Jan 2008)
+
+  24 Jan 2008; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-i810-2.2.1_pre20080123.ebuild:
+  Adding a home made snapshot of the future 2.2.1 release
+
+  23 Jan 2008; Raúl Porcel <armin76@gentoo.org>
+  xf86-video-i810-2.1.1.ebuild:
+  ia64 stable
+
+  18 Jan 2008; Rémi Cardona <remi@gentoo.org> xf86-video-i810-2.1.1.ebuild,
+  xf86-video-i810-2.2.0-r1.ebuild:
+  add xineramaproto dep (fixes bug #204926)
+
+  13 Jan 2008; Rémi Cardona <remi@gentoo.org>
+  -xf86-video-i810-2.1.99.ebuild, -xf86-video-i810-2.2.0.ebuild:
+  prune old versions
+
+  13 Jan 2008; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.1.1-fix_build_without_dri.patch,
+  xf86-video-i810-2.1.1.ebuild, xf86-video-i810-2.2.0-r1.ebuild:
+  Add patch to fix build with USE=-dri (see bug #103192)
+
+  10 Jan 2008; Daniel Gryniewicz <dang@gentoo.org>
+  xf86-video-i810-2.1.1.ebuild:
+  Marked stable on amd64 for bug #202087
+
+*xf86-video-i810-2.2.0-r1 (27 Dec 2007)
+
+  27 Dec 2007; Rémi Cardona <remi@gentoo.org>
+  +files/xf86-video-i810-2.2.0-fix_xv_segfault.patch,
+  +xf86-video-i810-2.2.0-r1.ebuild:
+  Add patch from git HEAD to fix XVideo support
+
+  19 Dec 2007; Dawid Węgliński <cla@gentoo.org>
+  xf86-video-i810-2.1.1.ebuild:
+  Stable on x86 (bug #202087)
+
+  05 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml:
+  remi's taking over maintenance.
+
+  01 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>; files/i810.xinf:
+  Update xinf file, used by sys-apps/kudzu and thus by system-config-display.
+
+*xf86-video-i810-2.2.0 (01 Dec 2007)
+
+  01 Dec 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-video-i810-2.2.0.ebuild:
+  (#199896) Bump, with more than 160 bugfixes since 2.1. Framebuffer
+  compression should be enabled by default now (except on 965GM), which will
+  save some power (~0.5W during typical 2D usage). It won't work if you have
+  tiling forced off, though. Other than that, lots of EXA fixes, some
+  dual-monitor fixes, enabled the CH7017/7018 DVO driver by default, a few
+  backlight fixes, and more.
+
+*xf86-video-i810-2.1.99 (13 Nov 2007)
+
+  13 Nov 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-video-i810-2.1.99.ebuild:
+  (#198677) Add 2.2 prerelease, unkeyworded. Add it to your package.keywords
+  file with '**' to use it.
+
+  09 Sep 2007; Raúl Porcel <armin76@gentoo.org>
+  xf86-video-i810-2.1.0.ebuild:
+  ia64 stable wrt #191615
+
+  07 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  xf86-video-i810-2.1.0.ebuild:
+  Stable on amd64 wrt bug #191615.
+
+*xf86-video-i810-2.1.1 (14 Aug 2007)
+
+  14 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-video-i810-2.1.1.ebuild:
+  Bump. Lots of bugfixes; if you've had issues with the 2.x series so far,
+  please try this.
+
+*xf86-video-i810-2.1.0 (14 Jul 2007)
+
+  14 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  +xf86-video-i810-2.1.0.ebuild:
+  Bump. Vast quantities of changes. Some include performance improvements,
+  power savings, support for new chipsets, fixes for VT switching, sDVO RGB
+  outputs, and 830 fixes.
+
+  27 May 2007; Donnie Berkholz <dberkholz@gentoo.org>; files/i810.xinf:
+  Import new stuff from RH: moves 945 and 965 chips onto the 'intel' driver.
+
+  05 May 2007; Daniel Gryniewicz <dang@gentoo.org>
+  xf86-video-i810-1.7.4.ebuild:
+  Marked stable on amd64 for bug #175465
+
+  29 Apr 2007; Andrej Kacian <ticho@gentoo.org>
+  xf86-video-i810-1.7.4.ebuild:
+  Stable on x86, bug #175465.
+
+  25 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  xf86-video-i810-1.7.4.ebuild:
+  Stable on ia64 wrt bug #175465
+
+  21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xf86-video-i810-1.6.0.ebuild, -xf86-video-i810-1.7.0-r1.ebuild,
+  -xf86-video-i810-1.7.2.ebuild, -xf86-video-i810-1.7.2-r1.ebuild,
+  -xf86-video-i810-1.7.3.ebuild:
+  Drop unused versions.
+
+  21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xf86-video-i810-1.9.91.ebuild, -xf86-video-i810-1.9.92.ebuild,
+  -xf86-video-i810-1.9.93.ebuild, -xf86-video-i810-1.9.94.ebuild:
+  Clean out 2.0 RCs.
+
+*xf86-video-i810-2.0.0 (21 Apr 2007)
+
+  21 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-2.0.0.ebuild:
+  Bump to 2.0 final.
+
+*xf86-video-i810-1.9.94 (06 Apr 2007)
+
+  06 Apr 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.9.94.ebuild:
+  Bump to 2.0RC4.  965GM support and several fixes.
+
+*xf86-video-i810-1.9.93 (28 Mar 2007)
+
+  28 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.9.93.ebuild:
+  Bump to 2.0 RC3.
+
+  22 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.9.92.ebuild:
+  Bump version to 2.0RC2.  Includes various bugfixes.
+
+*xf86-video-i810-1.9.91 (08 Mar 2007)
+
+  08 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.9.91.ebuild:
+  Release candidate to go along with the new xserver.  This brings the
+  long-awaited modesetting/RandR 1.2 work, along with some EXA work.
+  
+  This version breaks lots of stuff, probably including Compiz/Beryl.  You've
+  been warned!
+
+  24 Jan 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xf86-video-i810-1.4.1.3.ebuild:
+  Stop supporting Xorg 7.0.
+
+*xf86-video-i810-1.7.4 (14 Jan 2007)
+
+  14 Jan 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.7.4.ebuild:
+  Version bump.  Fixes issues on the i915 when restarting X.
+
+  09 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xf86-video-i810-1.7.3.ebuild:
+  Fix libdrm dependency (needs >=2.2).  Thanks to Miguel Barao of bug #157585.
+
+*xf86-video-i810-1.7.3 (08 Dec 2006)
+
+  08 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.7.3.ebuild:
+  Version bump.  Includes various bugfixes across the board, and support for the
+  new DRM memory manager.
+
+*xf86-video-i810-1.7.2-r1 (02 Nov 2006)
+
+  02 Nov 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix_965_xv.patch, +xf86-video-i810-1.7.2-r1.ebuild:
+  Fix xv on 965 chipsets.  (Bug #153101, Jack Lloyd)
+
+  19 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.6.5-fix_no_dri.patch, xf86-video-i810-1.6.5.ebuild:
+  Add upstream's patch to allow building without dri support.  This patch is
+  included in versions newer than 1.6.5 (1.7+).  (Bug #151347, Stan Behrens for
+  the report)
+
+  14 Oct 2006; Aron Griffis <agriffis@gentoo.org>
+  xf86-video-i810-1.6.5.ebuild:
+  Mark 1.6.5 stable on ia64. #144549
+
+*xf86-video-i810-1.7.2 (14 Oct 2006)
+
+  14 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.7.2.ebuild:
+  Version bump.  Main fixes include a suspend/resume fix and the VT switching
+  patch from 1.7.0-r1.
+
+  13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xf86-video-i810-1.6.5.ebuild:
+  AMD64/x86 stable for bug #144549 (X7.1).
+
+  05 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xf86-video-i810-1.6.1.ebuild:
+  Clean out an old ebuild from testing.
+
+*xf86-video-i810-1.7.0-r1 (05 Oct 2006)
+
+  05 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.7.0-fix_vt_switch.patch, -xf86-video-i810-1.7.0.ebuild,
+  +xf86-video-i810-1.7.0-r1.ebuild:
+  Fix VT switching on some systems. (Phil Blacker, bug #139290)
+
+*xf86-video-i810-1.7.0 (02 Oct 2006)
+
+  02 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.7.0.ebuild:
+  Version bump. Includes various bugfixes, including some 9xx-series fixes.
+
+  29 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; files/i810.xinf:
+  Update xinf file from Fedora CVS. Adds Apple 945GM and Aopen Mini PC.
+
+  05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; +files/i810.xinf:
+  Add hwdata files for system-config-display.
+
+  14 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org> ChangeLog:
+  Fixed up the ChangeLog.  Thanks to nelchael for noticing.
+
+*xf86-video-i810-1.6.5 (11 Aug 2006)
+
+  11 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/1.6.4-fix_dri_abi.patch, -xf86-video-i810-1.6.4-r1.ebuild,
+  +xf86-video-i810-1.6.5.ebuild:
+  Version bump.  Includes previous patch and various other fixes, including
+  improved i915 textured video support.
+
+*xf86-video-i810-1.6.4-r1 (10 Aug 2006)
+
+  10 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/1.6.4-fix_dri_abi.patch, -xf86-video-i810-1.6.4.ebuild,
+  +xf86-video-i810-1.6.4-r1.ebuild:
+  Add a patch from upstream that fixes the DRI ABI.  (Bug #143419, Sebastian
+  Bergmann.  Thanks to Roderick B. Greening for the upstream poking.)
+
+*xf86-video-i810-1.6.4 (10 Aug 2006)
+
+  10 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.6.4.ebuild:
+  Version bump.  Adds MergedFB and i965 support.
+
+*xf86-video-i810-1.6.1 (29 Jul 2006)
+
+  29 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.6.1.ebuild:
+  Version bump.  Includes a bunch of code cleanups and fixes.
+
+  10 Jul 2006; Aron Griffis <agriffis@gentoo.org>
+  xf86-video-i810-1.6.0.ebuild:
+  Mark 1.6.0 stable on ia64
+
+  01 Jul 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-i810-1.6.0.ebuild:
+  stable on sh
+
+  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  xf86-video-i810-1.4.1.3.ebuild:
+  Stable on amd64.
+
+  30 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-i810-1.4.1.3.ebuild:
+  x86 stable.
+
+  17 Jun 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-i810-1.6.0.ebuild:
+  ~x86-fbsd keyworded the lower version but not this.
+
+  16 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xf86-video-i810-1.4.1.3.ebuild:
+  Add ~x86-fbsd keyword.
+
+  14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xf86-video-i810-1.5.1.0.ebuild:
+  Remove older masked version.
+
+*xf86-video-i810-1.6.0 (14 Apr 2006)
+
+  14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.6.0.ebuild:
+  Bump for 7.1 RC1.
+
+  07 Apr 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xf86-video-i810-1.5.1.0.ebuild:
+  (#129072) Change xorg-server dep to minimum 1.0.2 for randrstr.h. Fix by
+  Alberto Bertogli.
+
+*xf86-video-i810-1.5.1.0 (01 Apr 2006)
+
+  01 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.5.1.0.ebuild:
+  Add new i810 driver.  The 1.5.x series will only work with Mesa 6.5/HEAD.
+
+  30 Jan 2006; Patrick McLean <chutzpah@gentoo.org>
+  xf86-video-i810-1.4.1.3.ebuild:
+  Added to ~amd64.
+
+  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xf86-video-i810-1.4.1.1.ebuild, -xf86-video-i810-1.4.1.2.ebuild:
+  Pull old versions.
+
+*xf86-video-i810-1.4.1.3 (23 Dec 2005)
+
+  23 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.4.1.3.ebuild:
+  Bump for 7.0.
+
+*xf86-video-i810-1.4.1.2 (18 Dec 2005)
+
+  18 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.4.1.2.ebuild:
+  Bump for 7.0RC4.
+
+  09 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  files/digest-xf86-video-i810-1.4.1.1, Manifest:
+  Update digest to match patch introduced by x-modular.eclass changes.
+
+  09 Dec 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xf86-video-i810-1.4.0-r3.ebuild, -xf86-video-i810-1.4.0.1.ebuild,
+  -xf86-video-i810-1.4.1.ebuild:
+  Pull old versions.
+
+*xf86-video-i810-1.4.1.1 (04 Dec 2005)
+
+  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.4.1.1.ebuild:
+  Bump for 7.0RC3.
+
+*xf86-video-i810-1.4.1 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.4.1.ebuild:
+  Bump for 7.0RC2.
+
+*xf86-video-i810-1.4.0.1 (20 Oct 2005)
+
+  20 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86-video-i810-1.4.0.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <dberkholz@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xf86-video-i810-1.4.0-r3.ebuild:
+  Moved x11-libs/libXvMC from DEPEND to RDEPEND.
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/xf86-video-i810-1.4.0-add-i830-shadow.patch:
+  Oops, missed removing this patch in the first run.
+
+*xf86-video-i810-1.4.0-r3 (02 Sep 2005)
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/1.4.0-i810-unresolved-symbols.patch,
+  -xf86-video-i810-1.4.0-r2.ebuild, +xf86-video-i810-1.4.0-r3.ebuild:
+  Sent a new snapshot to the mirrors bringing this driver in sync with CVS.  This
+  snapshot includes both prior patches.  Also added the x11-libs/XvMC dep as
+  XvMC support has been added as required for the time being.
+
+  23 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  -xf86-video-i810-1.4.0.ebuild, -xf86-video-i810-1.4.0-r1.ebuild:
+  Pull old versions.
+
+*xf86-video-i810-1.4.0-r2 (23 Aug 2005)
+
+  23 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/1.4.0-i810-unresolved-symbols.patch,
+  +xf86-video-i810-1.4.0-r2.ebuild:
+  (fd.o #4066) Add 1.4.0-i810-unresolved-symbols.patch to make i810 driver work.
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; -files/dri.patch:
+  Pull unused patch.
+
+*xf86-video-i810-1.4.0-r1 (12 Aug 2005)
+
+  12 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/xf86-video-i810-1.4.0-add-i830-shadow.patch,
+  +xf86-video-i810-1.4.0-r1.ebuild:
+  Bump to link in i830_shadow.c. This should allow X to start properly.
+  Reported by Joshua Baerge <joshuabaergen@gentoo.org>.
+
+*xf86-video-i810-1.4.0 (08 Aug 2005)
+
+  08 Aug 2005; Donnie Berkholz <dberkholz@gentoo.org>; +files/dri.patch,
+  +xf86-video-i810-1.4.0.ebuild:
+  Initial commit for modular X.
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
new file mode 100644
index 000000000000..f995f1fb0ced
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -0,0 +1,27 @@
+AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
+AUX 2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
+AUX 2.2.1-0001-fixup-pciaccess-version-detect.patch 824 RMD160 6e148f2fe467ba6e9d48e046f067ba405d10b0d1 SHA1 e80e2c8a24a4b54b35d6da5a28d4b70c0b20d8f1 SHA256 05d4ba845535c3bd6a28500251b9e6425af49e671a548d718cac81f57242823e
+AUX 2.3.2-0001-intel-fix-drm-check.patch 966 RMD160 f77d00d99bbc02d233fd3455055e6e8f6cd64f9e SHA1 93db1cf8fa34baf5728dfe1cbe0ffcdddb7ee065 SHA256 9edc49693ce22338057d3e06f391235cac82f3db3edce6dce1444175843c8b69
+AUX 2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch 1612 RMD160 d00b5607c258e8905ea91309d2244577918ddee8 SHA1 a995fb3718a6bd52a9248e766ad5d1f8adbaf1a8 SHA256 d8bfae95675f9ad5f81e12f42e6228e3a4311ce9690c4fff164ae69f12798782
+AUX 2.4.2-0002-Disable-render-standby.patch 1724 RMD160 52cd119e0d17b1d3439d1190e2551fc6f239594c SHA1 3e9d4649b2e6ee67f3a133631347b22aee8d83a4 SHA256 70dca79e533d9d1913fed90781c534af574e21e63fe5b858503ef8b3d6b02af4
+AUX 2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch 832 RMD160 a84da89567aa67b53bbc3c24b05724e45a3be212 SHA1 c69ef012f98b36c428688fa863f27d9f60fda601 SHA256 03a72ddddd2baec9e7769a6d8c906c71b33fc2a4b418ae1e4333fc568200ba8d
+AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
+DIST xf86-video-i810-1.6.5.tar.bz2 439503 RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 SHA1 7d9cf4fa18ec6dd7eefcb1589675c7bcffa384d0 SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f
+DIST xf86-video-i810-1.7.4.tar.bz2 461513 RMD160 cbb8ebd7e36d07513e00c232cbb1e0b12a0de3b2 SHA1 3c2837283ec3e9d1aeec430bb2460178aec94a90 SHA256 ff8cd89c9ba39ce68dd6ac4dcb222280835d007a20b419819749298e8ec74259
+DIST xf86-video-intel-2.1.1.tar.bz2 584729 RMD160 47596231378bed5c9a48511318b6e56ab184f319 SHA1 5a4e6205818ddd8fc8529e2bd5f6310fdc247f84 SHA256 4f7215b2cc9ab4b35be56fd26fb858d64665ffd241c59a2c2c81eb39f0d5c51c
+DIST xf86-video-intel-2.2.0.90.tar.bz2 602031 RMD160 bccabea790b876e8cab4ca6803b7a33cce697c6f SHA1 6c93afc8381c2b758f727f655dc61573a1f72b1d SHA256 f5705cdf3466954f50d2dd8565e05da37c5def10ae3f891e76a93c646eccabed
+DIST xf86-video-intel-2.2.1.tar.bz2 604749 RMD160 5746abeb91d5b017d54cb26d2689b34c492496a7 SHA1 7180c7ab83e3334053bd1bec1cdd1755b529e19c SHA256 d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a
+DIST xf86-video-intel-2.3.2.tar.bz2 665611 RMD160 5137493fb00b7a6fe3c03750f42599939a69c11b SHA1 86be1572c68a438bb92d40fff262b71d9e40c976 SHA256 060aaa267ded1d5d0987d077b1d4c027f99ee507cee8fd2e5233f15842f9ed27
+DIST xf86-video-intel-2.4.2.tar.bz2 684445 RMD160 939bd7d3bc6f1709f312dcbcaadb2e1d0c95bc06 SHA1 fe071bf0c98b1cce96f6647d87a74217632fc2ad SHA256 5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b
+DIST xf86-video-intel-2.4.98.0.tar.bz2 721624 RMD160 50ec2e78c94366f9abc3698d14733739ddc51d64 SHA1 8213fc95ceaa347cf96f70375d8820818b406400 SHA256 856ac75992ebcf0522b7d59c60514251922f7599569ca6fa7459b7f457bfce4b
+EBUILD xf86-video-intel-1.6.5.ebuild 1047 RMD160 9238caee2ab1436a669004b7ae1bc42b0e9f6111 SHA1 30831a0fff86052ec2ad038cb0dd5391a9737486 SHA256 c783dc648a7f7638a0e6dff185f0e4ee2bcf823b87f847f3fdf4bc814f9832ef
+EBUILD xf86-video-intel-1.7.4.ebuild 1014 RMD160 89134a9c2e25afa67ef7fef5be9cdd6d3d8edcfe SHA1 01fb2871a4d226d9706884dad95293dc20eb5673 SHA256 6cf6cf9b68f0a414d297702b4375f813bcdb1ea17e85310146d238322e9b635d
+EBUILD xf86-video-intel-2.1.1.ebuild 1076 RMD160 e5fb257032901e374cba5269ae0fe95edb705716 SHA1 99f12c1808bf67d6b99ca7db53aad6cf18379286 SHA256 73fb54cb04586a6b79640972c8b78adb7beb62601c78718f01dcddcb4c77f0cd
+EBUILD xf86-video-intel-2.2.0.90.ebuild 1016 RMD160 f43f1ccd93af11ba81215ffc84d79afab51c8821 SHA1 e8aed32360694d8a44c6ec3ffc0ad3083fa019f9 SHA256 916d8cb872cbf196431c7f8358c0b0511c7934532b8869c7bc3e1b97e3ac1ee2
+EBUILD xf86-video-intel-2.2.1.ebuild 1083 RMD160 6d1ea09c64f23b4a4db27ebe6d6c6485cce5bf5c SHA1 d56e43e777d9f19795543f1e6c8dace7ee04d208 SHA256 e9642a95744097d861b3a32a9a01e5948d5b893696275f99f91c60a82928fdf6
+EBUILD xf86-video-intel-2.3.2.ebuild 1079 RMD160 8460a7116d2a16f9e0cba6c1a4e3e90e6be25fb6 SHA1 54922b834d95c699db0c30db461da130787c2641 SHA256 4c5ca822bd21ea70adb07702bf27a42983d1297323019d8f6e4ceb904b0d18d9
+EBUILD xf86-video-intel-2.4.2-r2.ebuild 1157 RMD160 2f332e05f7b4c9465b1b08ca280c1dc7e4e699ff SHA1 9df2be0fb9be1e170a9d520d7ee256852e9bcb6e SHA256 b0701914dccc7e1869045771f325dc5b7632fdef445439f7c7256f38fa5f46da
+EBUILD xf86-video-intel-2.4.2-r3.ebuild 1223 RMD160 a21c3b3ba70cb6439beac6e43244c9bfb6b46e6f SHA1 17781acfeda78316281b1d33d74a80015177be81 SHA256 e2c0e9467f3a5f97c25af63d51c39da98825522cff26bceea8ee8260cbaed8e2
+EBUILD xf86-video-intel-2.4.98.0.ebuild 1002 RMD160 0659d0dea7bc4484c8d71fd5c4de9c01009e69ac SHA1 aca34b9976d602572ec005d7d6fcecc2a238f15a SHA256 4a3701283f9ef382c9d0d54368597872ddb97566c8485667a718a1be878ea8d6
+MISC ChangeLog 26283 RMD160 0bc1406a36f6eafc8d51d7046d578af81e6e2db7 SHA1 bff8dcb1c70e7a76fbfa94bc60f0820e3100ada5 SHA256 caadc998a9e81524dd499fc4f207f5653115fd315a2104e34fa6af874c550f1f
+MISC metadata.xml 157 RMD160 bfca46b367901674b4ec5419c063ae27fb446b0a SHA1 4fe7fb7398abd34822cec8be77f8aaf86e28a1a3 SHA256 bc6a4a3d5e32f9329039b242036828256c9f2c33862bc1d606d4ac8427032fdc
diff --git a/x11-drivers/xf86-video-intel/files/1.6.5-fix_no_dri.patch b/x11-drivers/xf86-video-intel/files/1.6.5-fix_no_dri.patch
new file mode 100644
index 000000000000..6d2b98955e33
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/1.6.5-fix_no_dri.patch
@@ -0,0 +1,62 @@
+--- src/i830_accel.c
++++ src/i830_accel.c
+@@ -395,6 +395,7 @@ I830AccelInit(ScreenPtr pScreen)
+    return XAAInit(pScreen, infoPtr);
+ }
+ 
++#ifdef XF86DRI
+ static unsigned int
+ CheckTiling(ScrnInfoPtr pScrn)
+ {
+@@ -416,6 +417,9 @@ CheckTiling(ScrnInfoPtr pScrn)
+ 
+    return tiled;
+ }
++#else
++#define CheckTiling(pScrn) 0
++#endif
+ 
+ void
+ I830SetupForSolidFill(ScrnInfoPtr pScrn, int color, int rop,
+--- src/i810_driver.c
++++ src/i810_driver.c
+@@ -333,6 +333,8 @@ const char *I810driSymbols[] = {
+    NULL
+ };
+ 
++#endif /* I830_ONLY */
++
+ const char *I810shadowSymbols[] = {
+     "shadowInit",
+     "shadowSetup",
+@@ -340,8 +342,6 @@ const char *I810shadowSymbols[] = {
+     NULL
+ };
+ 
+-#endif /* I830_ONLY */
+-
+ #ifndef I810_DEBUG
+ int I810_DEBUG = (0
+ /*                | DEBUG_ALWAYS_SYNC  */
+@@ -408,9 +408,9 @@ i810Setup(pointer module, pointer opts, 
+ #ifdef XF86DRI
+ 			I810drmSymbols,
+ 			I810driSymbols,
++#endif
+ 			I810shadowSymbols,
+ 			I810shadowFBSymbols,
+-#endif
+ 			I810vbeSymbols, vbeOptionalSymbols,
+ 			I810ddcSymbols, I810int10Symbols, NULL);
+ 
+--- src/brw_structs.h
++++ src/brw_structs.h
+@@ -28,6 +28,8 @@
+ #ifndef BRW_STRUCTS_H
+ #define BRW_STRUCTS_H
+
++#include <GL/gl.h>
++
+ /* Command packets:
+  */
+ struct header 
diff --git a/x11-drivers/xf86-video-intel/files/2.1.1-fix_build_without_dri.patch b/x11-drivers/xf86-video-intel/files/2.1.1-fix_build_without_dri.patch
new file mode 100644
index 000000000000..bc06c9755b04
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.1.1-fix_build_without_dri.patch
@@ -0,0 +1,35 @@
+From: Jesse Barnes <jbarnes@hobbes.virtuousgeek.org>
+Date: Thu, 3 Jan 2008 19:16:15 +0000 (-0800)
+Subject: Fix compilation error when not using DRI
+X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/driver/xf86-video-intel.git;a=commitdiff;h=f2ffc0f6e038357dda268363e52c11ada1d0b810
+
+Fix compilation error when not using DRI
+
+This patch complements 88f8b688e2316ae4a1f7485f0010ce90de54783a which
+added uint64_t typed variables to avoid unsigned long overflows in
+32-bit architectures but didn't include <stdint.h> with the required
+definition.
+
+When XF86DRI and _XF86DRI_SERVER_ are defined this header gets
+indirectly included through "i830_dri.h", thanks to "i830_common.h"
+which masquerades this problem as released in 2.1.0 and that manifests
+with :
+
+In file included from i810_driver.c:88:
+i830.h:137: error: expected specifier-qualifier-list before 'uint64_t'
+i830.h:240: error: expected specifier-qualifier-list before 'uint64_t'
+
+Patch from Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
+---
+
+--- a/src/i830.h
++++ b/src/i830.h
+@@ -40,6 +40,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ #define I830DEBUG
+ #endif
+ 
++#include <stdint.h>
++
+ #ifndef REMAP_RESERVED
+ #define REMAP_RESERVED 0
+ #endif
diff --git a/x11-drivers/xf86-video-intel/files/2.2.1-0001-fixup-pciaccess-version-detect.patch b/x11-drivers/xf86-video-intel/files/2.2.1-0001-fixup-pciaccess-version-detect.patch
new file mode 100644
index 000000000000..0644a02c11b1
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.2.1-0001-fixup-pciaccess-version-detect.patch
@@ -0,0 +1,28 @@
+From 13ae79b415d944891cfdc2cd2d5397fec36a4e8e Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@redhat.com>
+Date: Fri, 7 Mar 2008 08:04:37 +1000
+Subject: [PATCH] fixup pciaccess version detect
+
+---
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9e7c5b9..da44018 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,9 +115,9 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ CFLAGS="$save_CFLAGS"
+ 
+ if test x$XSERVER_LIBPCIACCESS = xyes; then
+-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0])
++	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
+ else
+-	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10.0],
++	PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10],
+ 				       have_libpciaccess=yes,
+ 				       have_libpciaccess=no)
+ fi
+-- 
+1.5.4.3
+
diff --git a/x11-drivers/xf86-video-intel/files/2.3.2-0001-intel-fix-drm-check.patch b/x11-drivers/xf86-video-intel/files/2.3.2-0001-intel-fix-drm-check.patch
new file mode 100644
index 000000000000..8ae16e3ae25e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.3.2-0001-intel-fix-drm-check.patch
@@ -0,0 +1,27 @@
+From 55678c64bc6e3ed613ea6db14c105c18a0cf28ce Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Tue, 1 Jul 2008 18:51:18 +1000
+Subject: [PATCH] intel: fix drm check.
+
+The -mm check is broken now that 2.3.1 is out.. make it 2.4.0, to be fixed
+with GEM etc.
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index af87299..2dabd4f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -201,7 +201,7 @@ if test "$DRI" = yes; then
+         PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto])
+         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
+         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
+-	PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.3.1],[DRI_MM=yes], [DRI_MM=no])
++	PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no])
+ 	if test "x$DRI_MM" = xyes; then
+ 		AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management])
+ 	fi
+-- 
+1.5.5.4
+
diff --git a/x11-drivers/xf86-video-intel/files/2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch b/x11-drivers/xf86-video-intel/files/2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch
new file mode 100644
index 000000000000..261e829cf054
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.4.2-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch
@@ -0,0 +1,63 @@
+From 95fe53b9fa5f44a1adb909909d609463d68578c2 Mon Sep 17 00:00:00 2001
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+Date: Wed, 20 Aug 2008 14:40:29 -0700
+Subject: [PATCH] Don't allocate a pipe for hotplug detection
+
+It shouldn't be needed...
+(cherry picked from commit 7b6f4d22211d71480caf6335a3eacaacff369371)
+
+diff --git a/src/i830_crt.c b/src/i830_crt.c
+index 2a99f9c..8274c0c 100644
+--- a/src/i830_crt.c
++++ b/src/i830_crt.c
+@@ -352,10 +352,9 @@ i830_crt_detect(xf86OutputPtr output)
+     xf86OutputStatus	    status;
+     Bool		    connected;
+ 
+-    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
+-    if (!crtc)
+-	return XF86OutputStatusUnknown;
+-
++    /*
++     * Try hotplug detection where supported
++     */
+     if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) ||
+ 	    IS_G33CLASS(pI830)) {
+ 	if (i830_crt_detect_hotplug(output))
+@@ -363,12 +362,19 @@ i830_crt_detect(xf86OutputPtr output)
+ 	else
+ 	    status = XF86OutputStatusDisconnected;
+ 
+-	goto out;
++	goto done;
+     }
+ 
++    /*
++     * DDC is next best, no flicker
++     */
++    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
++    if (!crtc)
++	return XF86OutputStatusUnknown;
++
+     if (i830_crt_detect_ddc(output)) {
+ 	status = XF86OutputStatusConnected;
+-	goto out;
++	goto out_release_pipe;
+     }
+ 
+     /* Use the load-detect method if we have no other way of telling. */
+@@ -378,9 +384,10 @@ i830_crt_detect(xf86OutputPtr output)
+     else
+ 	status = XF86OutputStatusDisconnected;
+ 
+-out:
++out_release_pipe:
+     i830ReleaseLoadDetectPipe (output, dpms_mode);
+ 
++done:
+     return status;
+ }
+ 
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.4.2-0002-Disable-render-standby.patch b/x11-drivers/xf86-video-intel/files/2.4.2-0002-Disable-render-standby.patch
new file mode 100644
index 000000000000..e80efaa6dd5f
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.4.2-0002-Disable-render-standby.patch
@@ -0,0 +1,60 @@
+From 86f82c429f5d7067c52d3b783988917869e13d1d Mon Sep 17 00:00:00 2001
+From: Zhenyu Wang <zhenyu.z.wang@intel.com>
+Date: Thu, 11 Sep 2008 15:49:41 +0800
+Subject: [PATCH] Disable render standby
+
+Render standby is known to cause possible hang issue on some
+mobile chips, so always disable it.
+
+diff --git a/src/i810_reg.h b/src/i810_reg.h
+index 8690954..af8c6a3 100644
+--- a/src/i810_reg.h
++++ b/src/i810_reg.h
+@@ -2815,4 +2815,7 @@ typedef enum {
+ 
+ #define PEG_BAND_GAP_DATA	0x14d68
+ 
++#define MCHBAR_RENDER_STANDBY	0x111B8
++#define RENDER_STANDBY_ENABLE	(1 << 30)
++
+ #endif /* _I810_REG_H */
+diff --git a/src/i830_driver.c b/src/i830_driver.c
+index 6f87c51..209aa07 100644
+--- a/src/i830_driver.c
++++ b/src/i830_driver.c
+@@ -2718,6 +2718,23 @@ i830_memory_init(ScrnInfoPtr pScrn)
+     return FALSE;
+ }
+ 
++static void
++i830_disable_render_standby(ScrnInfoPtr pScrn)
++{
++   I830Ptr pI830 = I830PTR(pScrn);
++   uint32_t render_standby;
++
++   /* Render Standby might cause hang issue, try always disable it.*/
++   if (IS_I965GM(pI830) || IS_GM45(pI830)) {
++       render_standby = INREG(MCHBAR_RENDER_STANDBY);
++       if (render_standby & RENDER_STANDBY_ENABLE) {
++	   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Disable render standby.\n");
++	   OUTREG(MCHBAR_RENDER_STANDBY,
++		   (render_standby & (~RENDER_STANDBY_ENABLE)));
++       }
++   }
++}
++
+ static Bool
+ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ {
+@@ -3053,6 +3070,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+    if (!vgaHWMapMem(pScrn))
+       return FALSE;
+ 
++   i830_disable_render_standby(pScrn);
++
+    DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n");
+ 
+    if (!pI830->useEXA) {
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch b/x11-drivers/xf86-video-intel/files/2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch
new file mode 100644
index 000000000000..8084a5761dd6
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/2.4.2-0003-never-enable-DRI_MM-on-this-branch.patch
@@ -0,0 +1,25 @@
+From 4d7cd8cec7ba56230b298986d7a91a7587984bc4 Mon Sep 17 00:00:00 2001
+From: Remi Cardona <remi@gentoo.org>
+Date: Sun, 19 Oct 2008 23:45:14 +0200
+Subject: [PATCH] never enable DRI_MM on this branch
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 809e84d..04e31f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,7 +202,7 @@ if test "$DRI" = yes; then
+         PKG_CHECK_MODULES(DRI, [libdrm xf86driproto glproto])
+         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
+         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
+-	PKG_CHECK_MODULES(DRI_MM, [libdrm >= 2.4.0],[DRI_MM=yes], [DRI_MM=no])
++	DRI_MM="no"
+ 	if test "x$DRI_MM" = xyes; then
+ 		AC_DEFINE(XF86DRI_MM,1,[Extended DRI memory management])
+ 	fi
+-- 
+1.6.0.2
+
diff --git a/x11-drivers/xf86-video-intel/files/i810.xinf b/x11-drivers/xf86-video-intel/files/i810.xinf
new file mode 100644
index 000000000000..ac5af9328344
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/i810.xinf
@@ -0,0 +1,23 @@
+alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* intel	# i815
+alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* intel	# 845G
+alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* intel	# 865G
+alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* intel	# 915G
+alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* intel	# E7221G ("915G")
+alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* intel	# 915GM
+alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* intel	# 945G
+alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* intel	# 945GM
+alias pcivideo:v00008086d000027AEsv*sd*bc*sc*i* intel	# 945GME
+alias pcivideo:v00008086d00002972sv*sd*bc*sc*i* intel	# 946GZ, really a 965
+alias pcivideo:v00008086d00002982sv*sd*bc*sc*i* intel	# 965G1
+alias pcivideo:v00008086d00002992sv*sd*bc*sc*i* intel	# 965Q
+alias pcivideo:v00008086d000029A2sv*sd*bc*sc*i* intel	# 965G
+alias pcivideo:v00008086d000029B2sv*sd*bc*sc*i* intel	# Q35
+alias pcivideo:v00008086d000029C2sv*sd*bc*sc*i* intel	# G33
+alias pcivideo:v00008086d000029D2sv*sd*bc*sc*i* intel	# Q33
+alias pcivideo:v00008086d00002A02sv*sd*bc*sc*i* intel	# 965GM
+alias pcivideo:v00008086d00002A12sv*sd*bc*sc*i* intel	# 965GME
+alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* intel	# i830
+alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* intel	# 855GM
+alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* intel	# i810
+alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* intel	# i810 DC100
+alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* intel	# i810E
diff --git a/x11-drivers/xf86-video-intel/metadata.xml b/x11-drivers/xf86-video-intel/metadata.xml
new file mode 100644
index 000000000000..6cc3982431f8
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild
new file mode 100644
index 000000000000..d5d549b9f82a
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 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-1.6.5.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+# Old i810 drivers
+SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-i810-${PV}.tar.bz2"
+S="${WORKDIR}/xf86-video-i810-${PV}"
+
+DESCRIPTION="X.Org driver for Intel cards"
+KEYWORDS="amd64 arm ia64 sh x86 ~x86-fbsd"
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES=("${FILESDIR}/${PV}-fix_no_dri.patch")
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild
new file mode 100644
index 000000000000..d89e8014d70e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 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-1.7.4.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+XDPVER=3
+
+inherit x-modular
+
+# Old i810 drivers
+SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-i810-${PV}.tar.bz2"
+S="${WORKDIR}/xf86-video-i810-${PV}"
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="amd64 arm ia64 sh x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.0.99
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild
new file mode 100644
index 000000000000..ea1ab6007659
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 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.1.1.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+#SNAPSHOT="yes"
+XDPVER=-1
+
+inherit x-modular eutils
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="amd64 arm ia64 sh x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	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
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+PATCHES=("${FILESDIR}/${PV}-fix_build_without_dri.patch")
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.0.90.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.0.90.ebuild
new file mode 100644
index 000000000000..352b32bbc217
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.0.90.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 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.2.0.90.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+#SNAPSHOT="yes"
+XDPVER=-1
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	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
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild
new file mode 100644
index 000000000000..1c153177f5d8
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 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.2.1.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+SNAPSHOT="yes"
+XDPVER=-1
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	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
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+PATCHES=("${FILESDIR}/${PV}0001-fixup-pciaccess-version-detect.patch")
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild
new file mode 100644
index 000000000000..a1e8d0bbcf16
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.3.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 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.3.2.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+SNAPSHOT="yes"
+XDPVER=-1
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	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
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES=("${FILESDIR}/${PV}-0001-intel-fix-drm-check.patch")
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r2.ebuild
new file mode 100644
index 000000000000..c8a731f8f9e2
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 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.4.2-r2.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+SNAPSHOT="yes"
+XDPVER=-1
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	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
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES=(
+"${FILESDIR}/${PV}-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch"
+"${FILESDIR}/${PV}-0002-Disable-render-standby.patch"
+)
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild
new file mode 100644
index 000000000000..bbaea758c6a7
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.2-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 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.4.2-r3.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+SNAPSHOT="yes"
+XDPVER=-1
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	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
+			>=x11-libs/libdrm-2.2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+PATCHES=(
+"${FILESDIR}/${PV}-0001-Don-t-allocate-a-pipe-for-hotplug-detection.patch"
+"${FILESDIR}/${PV}-0002-Disable-render-standby.patch"
+"${FILESDIR}/${PV}-0003-never-enable-DRI_MM-on-this-branch.patch"
+)
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.98.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.98.0.ebuild
new file mode 100644
index 000000000000..252946814806
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.4.98.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 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.4.98.0.ebuild,v 1.1 2008/10/22 13:55:23 remi Exp $
+
+# Must be before x-modular eclass is inherited
+# Enable snapshot to get the man page in the right place
+# This should be fixed with a XDP patch later
+XDPVER=-1
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.2
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	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
+			>=x11-libs/libdrm-2.4.0
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}