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

Package-Manager: portage-2.2_rc32/cvs/Linux i686

5 files changed, 7 insertions, 129 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/Manifest b/x11-drivers/xf86-video-intel/Manifest
index fe61950a5ffd..5486dc75bb70 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,4 +1,3 @@
-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
@@ -10,8 +9,6 @@ AUX 2.6.3-0001-clean-up-man-page-generation-and-remove-all-traces-o.patch 3382 R
 AUX 2.6.3-0002-Fix-Xv-crash-with-overlay-video.patch 809 RMD160 6f6d7f25efddeb2db9d35e2ea92d408a54af5a56 SHA1 2208274bb58f76503cf2d10d236e6591c48681cf SHA256 4236e01b101a69ca27dfc9c06c367d2b0a381afa343dc3a2b65504559b24fc3c
 AUX 2.7.0-0001-KMS-hook-up-output-properties-for-randr.patch 7360 RMD160 4220ba1238738098dadcf27ed70dfe97e9273188 SHA1 99427c926e22e9a8f6b2a4bf70ca7c6e94f0f1c4 SHA256 0771442935e5f64f7f45bcad6ef1984082492396e499fbe57c22dc2e99e4c475
 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.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
@@ -20,8 +17,6 @@ DIST xf86-video-intel-2.5.1.tar.bz2 716182 RMD160 f1d4b438931b564233dc4f76e3cb7f
 DIST xf86-video-intel-2.6.1.tar.bz2 789536 RMD160 642c0e0d296eaec18806059e60fdce9c448ce466 SHA1 c4d3fff72771c71eab152660be1fb33af679c06e SHA256 31a3ab9ce33542f1d6431eac992344d086345ccc8cd43a184c93c9d1b4a4086c
 DIST xf86-video-intel-2.6.3.tar.bz2 790275 RMD160 7b31866c2fd42fbb2d46efb137bf968d80221fb1 SHA1 96fe7e8b804ab8833b1d462f99c08be29bb9e283 SHA256 b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258
 DIST xf86-video-intel-2.7.0.tar.bz2 781254 RMD160 3e1bc024fb7a34c4efd817374b069c5b2e0288eb SHA1 6d55b11ccf92ddc0763329f6e503e1a55b9beacc SHA256 16d0f15a504916b68f94f2606dd5f401a4709c8e092195a0365b03113c684d94
-EBUILD xf86-video-intel-1.6.5.ebuild 867 RMD160 2089ced1b0cf1c00f89c408f141fd72a87f6d7df SHA1 e73e0470c8515e47151c7d45c7fd7c7da4e6c1c3 SHA256 e1c203961d2a2c2ee4de2d75bf86f2ec0df823fc959f3148394b4499cdecb118
-EBUILD xf86-video-intel-1.7.4.ebuild 823 RMD160 e65c3950cf5c2e66d1f5294540ab91b4c5f229a6 SHA1 4ff7f0a47ba005ce1e42b576d88a4b69956939d6 SHA256 7661bf548bef5d747b6518a8373847ad778e2b0003dbddb68b815980122a6080
 EBUILD xf86-video-intel-2.1.1.ebuild 781 RMD160 e88ce951e769df920bc90c9517fe8b148f94c208 SHA1 f57c69a2731ea6d255400edc887b03105f1a4406 SHA256 6df7b555574db73c0dfcec275fcbebd62ed44fb727dd5914289a21ad4bd949a2
 EBUILD xf86-video-intel-2.2.1.ebuild 807 RMD160 d58837d2eaea3632a2386f65fa49bb2e98828392 SHA1 0105b99e7a24d090c24160aa25ebf8f178586bd2 SHA256 95a69f1fcc6f6576e63880ff88294b89c2b5783418be59475cf7a0d0df1689da
 EBUILD xf86-video-intel-2.3.2.ebuild 796 RMD160 5cbde10a92dcba8712fb17cd0d0cda3ee291a7e9 SHA1 a0372bb5b2c2ca64f85f0012c857853075a31f16 SHA256 79c736dff5996f58e72baa6ce69aea982d5138ec23f6723b4d913a4a87af30d6
@@ -31,5 +26,5 @@ EBUILD xf86-video-intel-2.6.1.ebuild 909 RMD160 3d96ce737e513866f36fdccfa9a355a4
 EBUILD xf86-video-intel-2.6.3-r1.ebuild 972 RMD160 a33e6cbb3d14a837e54e2cb3c520ef34a0fd86fb SHA1 98273299cb4a32b87dbcf1105fbbc146115ac52b SHA256 9618a7f6a25aebc3e53ebccce0bdd87ce1c5e675875453ab190fcac84a3405ce
 EBUILD xf86-video-intel-2.6.3.ebuild 909 RMD160 43ec6bf4083d6ccb94e7dfe92de5ffe0a3f5a8c8 SHA1 b43e01e5d8b7c8f5c092684ec1f2d3e293515fc6 SHA256 7becd91c44522b2685814c02d359f7f77785ce350ae3748bfbd72bb2f8e6a16d
 EBUILD xf86-video-intel-2.7.0.ebuild 892 RMD160 b749db5d3267c84821154aed76fbea7ffb5e9b50 SHA1 2ad76437486a159435ba2ba0398365333bd9129f SHA256 2ed819f6bd17758aeb1de86112ba0413dc6bac147fab6c9049cde07c3481531b
-MISC ChangeLog 32383 RMD160 419e402e033049cfec943dfae2aa3d93eb68b0b8 SHA1 02b488db593d94c554252b7192cce87cee52a296 SHA256 938905d8dc4f9b8de3d69a7188ae6ccb35d9e2a59f5382bae9cebe1c8e561b0e
+MISC ChangeLog 32561 RMD160 46d761f085467221c9de55e0692dcff2da7cae4a SHA1 1beaa98bc5832c935946005abed0523c33c62028 SHA256 c049964789274740bc0af5bf9b5156a8537a2a2d953a61873c9bd8cabd336fbf
 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
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)"
-}