x11-drivers/xf86-video-intel: finally drop pre-2.0 drivers

(Portage version: 2.2_rc32/cvs/Linux i686)

4 files changed, 6 insertions, 123 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index a92fe4c2a6c7..b39ed9afaf14 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.24 2009/05/05 07:47:10 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.25 2009/05/08 23:18:54 remi Exp $
+
+  08 May 2009; Rémi Cardona <remi@gentoo.org>
+  -files/1.6.5-fix_no_dri.patch, -xf86-video-intel-1.6.5.ebuild,
+  -xf86-video-intel-1.7.4.ebuild:
+  finally drop pre-2.0 drivers
 
   05 May 2009; Rémi Cardona <remi@gentoo.org>
   xf86-video-intel-2.7.0.ebuild:
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
deleted file mode 100644
index 6d2b98955e33..000000000000
--- a/x11-drivers/xf86-video-intel/files/1.6.5-fix_no_dri.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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/xf86-video-intel-1.6.5.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild
deleted file mode 100644
index b86271406ea0..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-1.6.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-intel/xf86-video-intel-1.6.5.ebuild,v 1.5 2009/05/04 16:50:13 ssuominen Exp $
-
-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 ia64 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 )"
-
-PATCHES=("${FILESDIR}/${PV}-fix_no_dri.patch")
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
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
deleted file mode 100644
index 9fbeb8120e55..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-1.7.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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-intel/xf86-video-intel-1.7.4.ebuild,v 1.5 2009/05/04 16:50:13 ssuominen Exp $
-
-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 ia64 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 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}