x11-drivers/xf86-video-i810: remove 2.3 release candidates and patches

Package-Manager: portage-2.1.5_rc10

8 files changed, 9 insertions, 421 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index d6745e2e2104..fdbdf26a1eaa 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,13 @@
 # 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-i810/ChangeLog,v 1.86 2008/04/29 07:27:33 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.87 2008/05/14 08:49:35 remi Exp $
+
+  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)
 
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index ca4acfcddebe..4a85c48e84a4 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -2,28 +2,17 @@ AUX 0001-fixup-pciaccess-version-detect.patch 824 RMD160 6e148f2fe467ba6e9d48e04
 AUX 1.6.5-fix_no_dri.patch 1236 RMD160 5ab3bf1c3951c2fe7064fa13ffb573754ef594b1 SHA1 60f13aad5aa5f2a199ebc4b38ff468df9728ce5d SHA256 5b560f31a70b1998749e6cbcbfb6d7a94d3f9caf9ca4dad147662bc6eeb344da
 AUX i810.xinf 1442 RMD160 38dff5ef3b6548c9fdea8f6df2b607eee8f670f2 SHA1 cf0b700f6fa0734ea56ff9a167098649d8e3767e SHA256 c690ba8705e21394dcb927f4a5499c7dbdba492042d7d54eb3c21daf5d326347
 AUX xf86-video-i810-2.1.1-fix_build_without_dri.patch 1207 RMD160 8f562c70bb6f0612981bacf28bd0bc005d358cf3 SHA1 226de2c0d345099c3eb4eb48fddd37c384b5557c SHA256 48d2864503d3bc756fcb766cd61a7e0f4b71bfa0fbe78b3a22bf46cf6249ee61
-AUX xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch 4403 RMD160 f886e2e6bc91e8cf204892044371c867175edaa0 SHA1 b3edad65be074ea0e2376d7ca4434c643fbf8abc SHA256 29e0d5c527b1bd1374e3dcbfc9fc412c32798e496c8885413bb3d99fc7b35132
-AUX xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch 3432 RMD160 a368b6caefab695723f1b7b41bffdaa5792af9e0 SHA1 4fe35f1e06c435f087f5db1ff8a088b782d2bc84 SHA256 287f78430f9bfaef547ceb037d75630d825eed9c1285966ebd856ca6adfba7f2
-DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
-DIST x11-driver-patches-3.tar.bz2 404 RMD160 7a587f0791717b408f5fdeb86111ddcd9be113ff SHA1 ea479b7a3bc1400fad443801887f593d9eb11084 SHA256 6bc477e01cd88ca8237c581e0d7735c5e7f67c2d812e089043791d21dfd34b1a
 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.2.99.901.tar.bz2 665299 RMD160 d3602f1da982ebdc6162c0d2c100d964d510fb2f SHA1 ebde3be42f69329f62dfa7ab611ce6ae77d0636f SHA256 d7089ebb7aaf1cfe9b5db50ac9b7d9fe244fe1a49f74663ae5588465c62eeac2
-DIST xf86-video-intel-2.2.99.902.tar.bz2 667279 RMD160 47e11655ac2f7e2f85af61513e9fdfbfac76b103 SHA1 c5e3a4e13a1adbd642929e41e01a43b8ea2c4d47 SHA256 1c386a32e8c713b5a7f732211abebffb202341992c7c2a69ad3a1ca962b486a5
-DIST xf86-video-intel-2.2.99.903.tar.bz2 666933 RMD160 23b8649248df2c30b0d52944ad675e98ef80c752 SHA1 015561128fbbf45037ebecdc019844429e2a00d5 SHA256 bba8b276379944668c599ae5253b3a9d266cd2449599f1425ccca02227fbdc87
 DIST xf86-video-intel-2.3.0.tar.bz2 663384 RMD160 4680b4cab5f3bb2fdc1e536be800c16f2e0e634e SHA1 a257c12739b94b5897a0c21cd9b8da46bd311d24 SHA256 f3db6dcf88d63e4aa4a3dec0edd00b75a664d8c9500cd8c42fd94a2964bb3ae7
 EBUILD xf86-video-i810-1.6.5.ebuild 903 RMD160 b0f667881f34ec0aaf6c84c4722343aa80e8357c SHA1 f6cdec5ac5fb797f1bf20850d279762a4c450a65 SHA256 b67b560d633cfc290a494b0f0e277f81d063e6319c8f38fa0fd41aca67ab3c2a
 EBUILD xf86-video-i810-1.7.4.ebuild 863 RMD160 6e9e46e03134f840dfcdc0263871bd77ac57b9af SHA1 2d523f124ccb9c19014c977091ec02414a7bc8bc SHA256 d8998319b1fe36e5d6be2fc001f8061fe1395644d13e191f952fca882aa41175
 EBUILD xf86-video-i810-2.1.1.ebuild 1271 RMD160 42bb0909762236767f46048651c2c8692db339b9 SHA1 b8d4fff6c7354bc0faabdcafe4c74ea8e4d4f718 SHA256 04c59a29df8f52cbe8efb97be1bd6e0e1de2949f71a8695468d35ea97ff45fed
 EBUILD xf86-video-i810-2.2.0.90.ebuild 1163 RMD160 25a179cd03fb49fcccca211a8ec9cc437a3169b2 SHA1 5037d9aa3954cd69a159960d1fd66228fdb2b7f9 SHA256 130c083c10dcaf77cb6232b17e12ecf21d8580e8a05acdde21ddc462455102d7
 EBUILD xf86-video-i810-2.2.1.ebuild 1228 RMD160 822d64308393e0c31fc932c6472df53dcd4d27fb SHA1 b8cb314fc8ac83bd99e7cf0f31a7e877219051b9 SHA256 ab145dea0fce22fc47a1f2a588f2ed5a8ccd45800fe8ebeb4e1ed3e321b589f2
-EBUILD xf86-video-i810-2.2.99.901.ebuild 1164 RMD160 14b0e8492f644d980bb82f8585d6d95a1fbc3d6f SHA1 56522c09a9f23514f3a79bc43c443dd08b097389 SHA256 cd8be3be3440d1b3d704210c1e58e6490613dcb476f6787ac86ba8e55a62d459
-EBUILD xf86-video-i810-2.2.99.902.ebuild 1247 RMD160 72bf58c7ed5a6b81bb9c75dbf81d5dab45e2d8b9 SHA1 cc3176dac8b5ca7a8fa407695300deac1ca581af SHA256 ad1cc6fa98bd1bacd43ffdc8ffa5814506ccef5dc47c8f89190568235e81ca70
-EBUILD xf86-video-i810-2.2.99.903-r1.ebuild 1239 RMD160 b2f1dd73116f624a7996cfeeab0df764d2709fb8 SHA1 d78c39c02e1a78babfb0de5e3b8f06d263fabc70 SHA256 b2cdc935790a082e3ece7ca223a85a9b689c4a320ff40e2774a230d5598463b0
-EBUILD xf86-video-i810-2.2.99.903.ebuild 1164 RMD160 a92cc8b62989fe819f57f5c09fc9668db089fde6 SHA1 694954908399bec0797c78b61464a01aeea7f818 SHA256 0e00fe8f13afc1859c00054fc1e8a93da7eeaec91867ecbebb68bc0f5a0c8dee
 EBUILD xf86-video-i810-2.3.0.ebuild 1159 RMD160 bd8314174ce495da26d44d716da4f007e57b4c14 SHA1 d2397092640ab208cc09dfefccfba314c369dca5 SHA256 290b71cfc06ecee369a88919340d3aee3ed3cf93ed96e0b259bcb05cf249429d
-MISC ChangeLog 15727 RMD160 604b063dba3306d8a961d8105d85e74d1cea2279 SHA1 fe6f17bb9574a8929bb89f2662536d32925edb95 SHA256 9e8d48f1f51b167b3fe0900b69407a295185d5cf64d8d3203b75ce295cc69c51
+MISC ChangeLog 16118 RMD160 58bdac225d5509698b66f319cedb147cd447ab1a SHA1 7564eb42c45fb2e71590b41f4cf7e3cc698cc586 SHA256 51457033ec555d65024eef61e4f6982c9b0c6af8304b0af42c98518bac26add2
 MISC metadata.xml 248 RMD160 1bc22252fb59ed171fe013e765baa171151843cf SHA1 1df26c31e85768bb440888be23ba6fdcb421843d SHA256 a52fe0f6937ba347182a10ae3c710ee5524086af9b011567f5629ba165bf7dcd
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch
deleted file mode 100644
index 751e2937e8b6..000000000000
--- a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.902-enable_center_panel_fitting_on_i8xx.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff --git a/src/i830.h b/src/i830.h
-index 1319c6a..bd41a2f 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -288,6 +288,7 @@ typedef struct _I830OutputPrivateRec {
-    I2CBusPtr		    pDDCBus;
-    struct _I830DVODriver    *i2c_drv;
-    Bool			    load_detect_temp;
-+   uint32_t		    lvds_bits;
-    int                      pipe_mask;
-    int			    clone_mask;
-    /** Output-private structure.  Should replace i2c_drv */
-diff --git a/src/i830_display.c b/src/i830_display.c
-index 6a2d1d7..4f3f8ef 100644
---- a/src/i830_display.c
-+++ b/src/i830_display.c
-@@ -1059,6 +1059,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
-     xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-     I830Ptr pI830 = I830PTR(pScrn);
-     I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-+    I830OutputPrivatePtr intel_output;
-     int pipe = intel_crtc->pipe;
-     int plane = intel_crtc->plane;
-     int fp_reg = (pipe == 0) ? FPA0 : FPB0;
-@@ -1088,7 +1089,7 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
-      */
-     for (i = 0; i < xf86_config->num_output; i++) {
- 	xf86OutputPtr  output = xf86_config->output[i];
--	I830OutputPrivatePtr intel_output = output->driver_private;
-+	intel_output = output->driver_private;
- 
- 	if (output->crtc != crtc)
- 	    continue;
-@@ -1302,6 +1303,8 @@ i830_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
- 		lvds |= LVDS_DITHER_ENABLE;
- 	}
- 
-+	lvds |= intel_output->lvds_bits;
-+
- 	OUTREG(LVDS, lvds);
- 	POSTING_READ(LVDS);
-     }
-diff --git a/src/i830_lvds.c b/src/i830_lvds.c
-index 33b4f26..ddc9b8e 100644
---- a/src/i830_lvds.c
-+++ b/src/i830_lvds.c
-@@ -62,7 +62,6 @@ struct i830_lvds_priv {
-     
-     /* The panel needs dithering enabled */
-     Bool	    panel_wants_dither;
--    Bool	    need_border;
- 
-     /* restore backlight to this value */
-     int		    backlight_duty_cycle;
-@@ -542,23 +541,22 @@ i830_lvds_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
-     adjusted_mode->Clock = dev_priv->panel_fixed_mode->Clock;
-     xf86SetModeCrtc(adjusted_mode, INTERLACE_HALVE_V);
- 
-+    /* Make sure pre-965s set dither correctly */
-+    if (!IS_I965G(pI830) && dev_priv->panel_wants_dither)
-+	pfit_control |= PANEL_8TO6_DITHER_ENABLE;
-+
-     /* Native modes don't need fitting */
-     if (adjusted_mode->HDisplay == mode->HDisplay &&
- 	adjusted_mode->VDisplay == mode->VDisplay) {
--	pfit_control = 0;
- 	pfit_pgm_ratios = 0;
- 	border = 0;
- 	goto out;
-     }
- 
--    /* Basic panel fitting options */
--    if (!IS_I965G(pI830)) {
--	if (dev_priv->panel_wants_dither)
--	    pfit_control |= PANEL_8TO6_DITHER_ENABLE;
--    } else {
-+    /* 965+ wants fuzzy fitting */
-+    if (IS_I965G(pI830))
- 	pfit_control |= (intel_crtc->pipe << PFIT_PIPE_SHIFT) |
- 	    PFIT_FILTER_FUZZY;
--    }
- 
-     /*
-      * Deal with panel fitting options.  Figure out how to stretch the image
-@@ -721,8 +719,11 @@ i830_lvds_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
- out:
-     dev_priv->pfit_control = pfit_control;
-     dev_priv->pfit_pgm_ratios = pfit_pgm_ratios;
--    dev_priv->need_border = border;
- 
-+    if (border)
-+	intel_output->lvds_bits |= LVDS_BORDER_ENABLE;
-+    else
-+	intel_output->lvds_bits &= ~LVDS_BORDER_ENABLE;
-     /* XXX: It would be nice to support lower refresh rates on the
-      * panels to reduce power consumption, and perhaps match the
-      * user's requested refresh rate.
-@@ -734,23 +735,7 @@ out:
- static void
- i830_lvds_prepare(xf86OutputPtr output)
- {
--    I830OutputPrivatePtr    intel_output = output->driver_private;
--    struct i830_lvds_priv   *dev_priv = intel_output->dev_priv;
--    ScrnInfoPtr		    pScrn = output->scrn;
--    I830Ptr		    pI830 = I830PTR(pScrn);
--    uint32_t		    lvds;
--
--    lvds = INREG(LVDS);
--
--    i830_lvds_dpms(output, DPMSModeOff);
--    /*
--     * ->prepare will be called after the CRTC is off but before
--     * we set the mode, so program the PFIT regs here.
--     */
--    if (dev_priv->need_border)
--	OUTREG(LVDS, lvds | LVDS_BORDER_ENABLE);
--    else
--	OUTREG(LVDS, lvds & (~LVDS_BORDER_ENABLE));
-+	i830_lvds_dpms(output, DPMSModeOff);
- }
- 
- static void
-@@ -767,8 +752,6 @@ i830_lvds_mode_set(xf86OutputPtr output, DisplayModePtr mode,
-      */
-     OUTREG(PFIT_PGM_RATIOS, dev_priv->pfit_pgm_ratios);
-     OUTREG(PFIT_CONTROL, dev_priv->pfit_control);
--    /* It's harmless to turn on the LVDS if it's already on */
--    i830_lvds_dpms(output, DPMSModeOn);
- }
- 
- /**
diff --git a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch b/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch
deleted file mode 100644
index ba7a883d3c13..000000000000
--- a/x11-drivers/xf86-video-i810/files/xf86-video-i810-2.2.99.903-fix-panel-resize-on-i8xx.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff --git a/src/i830.h b/src/i830.h
-index 834e4dc..e2c39cc 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -857,6 +857,17 @@ static inline int i830_fb_compression_supported(I830Ptr pI830)
- 
- Bool i830_pixmap_tiled(PixmapPtr p);
- 
-+#define i830_exa_check_pitch_2d(p) do {\
-+    uint32_t pitch = intel_get_pixmap_pitch(p);\
-+    if (pitch > KB(32)) return FALSE;\
-+} while(0)
-+
-+/* For pre-965 chip only, as they have 8KB limit for 3D */
-+#define i830_exa_check_pitch_3d(p) do {\
-+    uint32_t pitch = intel_get_pixmap_pitch(p);\
-+    if (pitch > KB(8)) return FALSE;\
-+} while(0)
-+
- /* Batchbuffer compatibility handling */
- #define BEGIN_BATCH(n) BEGIN_LP_RING(n)
- #define ENSURE_BATCH(n)
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index 155e7a9..41c0578 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -3108,7 +3108,7 @@ I830FreeScreen(int scrnIndex, int flags)
- #ifdef INTEL_XVMC
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     I830Ptr pI830 = I830PTR(pScrn);
--    if (pI830->XvMCEnabled)
-+    if (pI830 && pI830->XvMCEnabled)
- 	intel_xvmc_finish(xf86Screens[scrnIndex]);
- #endif
-    I830FreeRec(xf86Screens[scrnIndex]);
-diff --git a/src/i830_exa.c b/src/i830_exa.c
-index 9b5bb93..2c807c5 100644
---- a/src/i830_exa.c
-+++ b/src/i830_exa.c
-@@ -170,6 +170,8 @@ I830EXAPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
-     if (pPixmap->drawable.bitsPerPixel == 24)
- 	I830FALLBACK("solid 24bpp unsupported!\n");
- 
-+    i830_exa_check_pitch_2d(pPixmap);
-+
-     offset = exaGetPixmapOffset(pPixmap);
-     pitch = exaGetPixmapPitch(pPixmap);
- 
-@@ -255,6 +257,9 @@ I830EXAPrepareCopy(PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap, int xdir,
-     if (!EXA_PM_IS_SOLID(&pSrcPixmap->drawable, planemask))
- 	I830FALLBACK("planemask is not solid");
- 
-+    i830_exa_check_pitch_2d(pSrcPixmap);
-+    i830_exa_check_pitch_2d(pDstPixmap);
-+
-     pI830->pSrcPixmap = pSrcPixmap;
- 
-     pI830->BR[13] = I830CopyROP[alu] << 16;
-diff --git a/src/i830_lvds.c b/src/i830_lvds.c
-index a5004b4..1562c21 100644
---- a/src/i830_lvds.c
-+++ b/src/i830_lvds.c
-@@ -1366,9 +1366,10 @@ i830_lvds_init(ScrnInfoPtr pScrn)
- 
-     /*
-      * Default to filling the whole screen if the mode is less than the
--     * native size, without breaking aspect ratio.
-+     * native size. (Change default to origin FULL mode, i8xx can only work
-+     * in that mode for now.)
-      */
--    dev_priv->fitting_mode = FULL_ASPECT;
-+    dev_priv->fitting_mode = FULL;
- 
-     return;
- 
-diff --git a/src/i830_render.c b/src/i830_render.c
-index 195e9a8..3a959e8 100644
---- a/src/i830_render.c
-+++ b/src/i830_render.c
-@@ -398,6 +398,11 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture,
-     Bool is_affine_src, is_affine_mask;
-     Bool is_nearest = FALSE;
- 
-+    i830_exa_check_pitch_3d(pSrc);
-+    if (pMask)
-+	i830_exa_check_pitch_3d(pMask);
-+    i830_exa_check_pitch_3d(pDst);
-+
-     IntelEmitInvarientState(pScrn);
-     *pI830->last_3d = LAST_3D_RENDER;
- 
-diff --git a/src/i915_render.c b/src/i915_render.c
-index 2b9ed04..4a02cf5 100644
---- a/src/i915_render.c
-+++ b/src/i915_render.c
-@@ -323,6 +323,11 @@ i915_prepare_composite(int op, PicturePtr pSrcPicture,
-     Bool is_affine_src, is_affine_mask;
-     Bool is_nearest = FALSE;
- 
-+    i830_exa_check_pitch_3d(pSrc);
-+    if (pMask)
-+	i830_exa_check_pitch_3d(pMask);
-+    i830_exa_check_pitch_3d(pDst);
-+
-     IntelEmitInvarientState(pScrn);
-     *pI830->last_3d = LAST_3D_RENDER;
- 
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.901.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.901.ebuild
deleted file mode 100644
index 1dd40ee77a11..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.901.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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-i810/xf86-video-i810-2.2.99.901.ebuild,v 1.1 2008/03/28 07:34:52 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
-
-# This really needs a pkgmove...
-SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
-
-S="${WORKDIR}/xf86-video-intel-${PV}"
-
-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-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-i810/xf86-video-i810-2.2.99.902.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.902.ebuild
deleted file mode 100644
index 59524e9b9a97..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.902.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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-i810/xf86-video-i810-2.2.99.902.ebuild,v 1.1 2008/04/06 21:21:12 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
-
-# This really needs a pkgmove...
-SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
-
-S="${WORKDIR}/xf86-video-intel-${PV}"
-
-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-libs/libdrm-2.2
-			x11-libs/libX11 )"
-
-PATCHES=("${FILESDIR}/${PN}-2.2.99.902-enable_center_panel_fitting_on_i8xx.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-i810/xf86-video-i810-2.2.99.903-r1.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild
deleted file mode 100644
index 6416c821de26..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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-i810/xf86-video-i810-2.2.99.903-r1.ebuild,v 1.1 2008/04/18 17:28:17 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
-
-# This really needs a pkgmove...
-SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
-
-S="${WORKDIR}/xf86-video-intel-${PV}"
-
-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-libs/libdrm-2.2
-			x11-libs/libX11 )"
-
-PATCHES=("${FILESDIR}/${PN}-2.2.99.903-fix-panel-resize-on-i8xx.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-i810/xf86-video-i810-2.2.99.903.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903.ebuild
deleted file mode 100644
index c9bbb827518d..000000000000
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-2.2.99.903.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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-i810/xf86-video-i810-2.2.99.903.ebuild,v 1.1 2008/04/14 05:55:53 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
-
-# This really needs a pkgmove...
-SRC_URI="http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-${PV}.tar.bz2"
-
-S="${WORKDIR}/xf86-video-intel-${PV}"
-
-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-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
-}