Drop some old versions, adjust dependency on others to account for xorg-server-1.14 incompatibility, bug #461360.

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64

8 files changed, 14 insertions, 298 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 73aeb1166d12..cb2f60ba3799 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.127 2013/02/22 07:10:44 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.128 2013/03/11 14:23:32 chithanh Exp $
+
+  11 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -files/xf86-video-intel-2.20.19-discard-mappings.patch,
+  -xf86-video-intel-2.20.19-r1.ebuild, -xf86-video-intel-2.20.2.ebuild,
+  -xf86-video-intel-2.21.0.ebuild, -xf86-video-intel-2.21.2.ebuild,
+  xf86-video-intel-2.19.0.ebuild:
+  Drop some old versions, adjust dependency on others to account for xorg-
+  server-1.14 incompatibility, bug #461360.
 
 *xf86-video-intel-2.21.3 (22 Feb 2013)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 87ca75e69a12..b7d6174fe8bd 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,19 +1,10 @@
-AUX xf86-video-intel-2.20.19-discard-mappings.patch 1120 SHA256 f40956aecdbe2b3fdc39f779ae985181969277941f88f21cb376572b0e618ab8 SHA512 7cc39c8b598d57c968d3fe8ab71fdaa890912cadebf804c3837841430969218a71ab2867a021938096c2303a30cc8f52051451a2cd864acb664bd41b8bff822e WHIRLPOOL 68cb457e7ce554c9632c84adae09519dc1b69a83b6fc9d6070c754d4cfa71090d11cc597b90359fda77ac25c0180877ba43e26781744b47aa99b301f351140f0
 DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc SHA512 988f231570cdd7e5c60880472c8bee765def040addf1fa6e5bc9e8a8722b5500d4ae2b798383dc90f2ca3df439e230c4df2d7e3f7cb50341d2d3d38486520292 WHIRLPOOL a19605d2473e72fc4e81a7a327a9b8e9534bdfceca64b44a3d0fd62bf031c9ec10c7d12379b9ca327bde8bc90e15c73cee7ef2de71de00c92bc70969f2a91d37
 DIST xf86-video-intel-2.20.13.tar.bz2 1649369 SHA256 0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3 SHA512 4f70ba1e794d26f8cbbb52c4936cfc8cdf4f43a353d9f921bf519a02a0c7f1b1eec6b3aa706ee6fc333a89b152416b9526f5d951ddea23ed70400e975c59febe WHIRLPOOL 101dff2402c75d0a48243ce1e3ac11e529f2d26a8d81321ae9ec528b6d35a3ed7647c342a2cf60389a69d677c29798c84e3252932b64f905966ef5af695cffbf
-DIST xf86-video-intel-2.20.19.tar.bz2 1665703 SHA256 b9b20efe3118beaaa0f71954c9407a59bb439bf43dabe0eb4f1b62051cdbc74c SHA512 73efab7f5341d429eace74524ab1ed5f37a3dcbbaac177c31f1ff2bd1450b865d4cd05ecea07b38ecdec737f14ea75e88a0984f94b5586599cf9c64e2c6c1aba WHIRLPOOL eb16c7c55dd7da46aa1bd36eff0dfe1ebc06be3f641ec6bc600b946b47ebc1a7c82531ecda1399e30271f4ed9e98a1a7fdd4d1f5281e36f2accd2bdde9ccd172
-DIST xf86-video-intel-2.20.2.tar.bz2 1559622 SHA256 4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9 SHA512 bbb5bd42a31b67003ef440ce55593bc78feaf20a31bbf68b1152ad4dffbbb7f9a3581e63775024829d21260fc2d4e363fa47d9dba404e7a44bfced418eb6a940 WHIRLPOOL 40bd264ed3636be8117d7e2036bc044a4bdc074997765c851ce2097685e11cd241ff34cbf6611710e20f45210d0a5a81d61c96eaf6d33af48e44ed8104b63247
-DIST xf86-video-intel-2.21.0.tar.bz2 1690400 SHA256 d872adef06cbf1a4434811baad4b8a18feacc6633b59b36557e8d7db7161081c SHA512 45a0c743e8631e933987275affdf8a0bb14e54bbdd17f914216b27327a4b3fed6c535ed4b707bd1ab8bb367b3e45c96b07c7dac2358bd9c45648e5a768363a39 WHIRLPOOL eeb45facd4168049072dcbf588b6846d2b551bc7b3db8c956bddcccb00215ca53c82623ef3c6801878374cf47eb91c83cf6ebe4e9b668e815333e90e7297e8b2
-DIST xf86-video-intel-2.21.2.tar.bz2 1696958 SHA256 2e6890ecacc715caa5459581b00b63152e08646ea1b76330bf79b996a139d850 SHA512 50f903b8cc50ed5683cc8df31674fcc8d53686cc122115be8a997a03cb141ca13db74dbc4b9b1642d3c6f0e37b36a1ea489e553571c4363672bde45d1251627e WHIRLPOOL cdc95ce88b36c07248450c8b7a01c9cfcf409aa8b0e14e6ec72d5a877468924cb4314fb2a1a4269ebf3d71731af9bf592705886df8d9b95f3203f686a377d5cf
 DIST xf86-video-intel-2.21.3.tar.bz2 1699891 SHA256 1ce672a042226dba776649e9067827c24fbb27383c78919a372265bb0d939dbb SHA512 513d35936a223cc2b75e415554e99d747e2e00f8bf5dc57b99b9962311d15d27ad8753358768708de487e381bf2207987fe1fadf23d866484fc07c51f0f9adfb WHIRLPOOL e7ca4534f2de68bb821ffea375d1f067d5fe1c42148bb43f8ebf980b41b82fb6c40f2bc904c4b50f2ac095f8c3eb1e203ab6b7cb67031da06fd1beba21519d5e
 DIST xf86-video-intel-2.9.1.tar.bz2 789001 SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 SHA512 62a7c1852b2d0b89be93536e7852caf398fc743e11a12c5071baed5e767b29c382ff5eb9d6c3ab453fc4d94aa16245b607ef33b94198bf7c7626746772fcc290 WHIRLPOOL 7e61c5d1396829aa354c9fdfbe5a21723171390d86b3307a2a331061e128a9866408993410090fe5d607609d245c55843633730bc4521e9cb0ec478c8d6ede1c
-EBUILD xf86-video-intel-2.19.0.ebuild 1366 SHA256 a7094e1ebea341f28078384f6951b0e6cc0c80bd7b2b13d614edab7dc1733afe SHA512 5393a432b9dc47e537c6389d16e0f1aeca35552a486a7bf2f7290b7e9b6550c88cf375516ccf5836abc7c1b4a37c3042b2ecbd947d97541e4ebae36ea6baa397 WHIRLPOOL 7a2890b93d19b57d301b9c30a35837cee4d8077cb1d26e8e317b630f0776d9d7a99683c88b41428f9d0b6eb5cc2050447b4c851cf49549c4262c963e89627e54
+EBUILD xf86-video-intel-2.19.0.ebuild 1397 SHA256 922046f7f3253a3e4dbbb8dffbbfdc455345a66c85eece1ef710c46ed44f5113 SHA512 c071158fae241dfa061a029168dc65527a3c57716d87c714d721a933d747c3fecf87bb30dc9c27d75a52cfb2bce2f2da9fb488b58e1c067c34d65abedc35392f WHIRLPOOL 4c8e832531631f432723fea23e7db7a54d957b42c2575e66e62a1cf13bba4fd5936c12bc79b54d0483fb82784368d7e997ae38c33aa28caf32ccac0e13669c9e
 EBUILD xf86-video-intel-2.20.13.ebuild 1515 SHA256 f896d7999de9993f4d79cab048b35980b8d2f6009426628df7b3378fdfe2a180 SHA512 2f16066a6cf096030d70e3439d04b4999c5fa7f693b3ee3e38d2cc59d1cc566577e827d807c028845a725dd10f46ee557f42804fd28b7ec0c5f2891778101573 WHIRLPOOL a9090c7e66733c7f8a4c5a80951d9da3652c37a96e6cc50d49765eafdee270df3c10b2c3608bf23adad2e3ac6825d02582330b21f4755c4b32206c41653d59fe
-EBUILD xf86-video-intel-2.20.19-r1.ebuild 1576 SHA256 9c35dff76e5601834325a9f170308f3709cfecf15f709ba12a929f405fbb1f95 SHA512 80d07a89e77140e934c1314a0970352658830b351f99b9fe3826a5bc2705180fae04052ba9fff21bbf913dfb0969351d8d2669037c30e590047d4de213b35cfb WHIRLPOOL bd27c1353ffafe11caac63a86779eef5e512d8c38339a89b149bb0bcdc2872f993b482f19fe78ebd65d075ee45e4e3ba8e9c55f7795f56fe22341dfac9cc4dda
-EBUILD xf86-video-intel-2.20.2.ebuild 1349 SHA256 81bb2c5e5ebce7e331fb73aca4be6c8982ff11f5f63bdb1a9200cc6319e2bbd1 SHA512 6ea2ddcb4f2c6a8f61d1b073f9d37d8120ace784ea4132eee5c9c10429fb00fa2ac562b27ee6fee7f60858c40712f3ed9ca8472e10613026583a1ae34c157317 WHIRLPOOL 5a8d90f4fd52de16482b62683bc613ee75fa1451fb6187198ba2d77db6d2de46a9f6a0534be12f58428dd292d07a355f0d820fbd5bc0fd165799a116fa0e9ebf
-EBUILD xf86-video-intel-2.21.0.ebuild 1516 SHA256 7b645b1e15ddb2438b7669b7ccd6c5391660e62046af20c6513ba544e666c897 SHA512 c91f69e8adae04d59af00affaff721797a20100670ff4c367f2d26eeda7ccfc4c3e38edd84ef0a0f718821bdb546287adb485e36206002cc278f4044ea32747a WHIRLPOOL b232b2356682d999bb2633a91db7835716f2df5a001c3f5ca203d8b6018334fa048c1874679f0a9aee1d13aa4fd965e85d9eeab68a80643d6e79c879c6afa9bc
-EBUILD xf86-video-intel-2.21.2.ebuild 1512 SHA256 607efbad04b03972b346ff32ee213371ac12ec605a659700d9236f7ae5787c38 SHA512 975372cfc68e09ef08c18ca654ae89fa59f796f115a1950e7fc2234326d407ac56e9f2f6a53c3f849d9cca5d010c8b30547e5bc943d7d11e4b64273b6fb0db8b WHIRLPOOL cd4e41a428274d05565c8e071be69573436f66e5e1c64bf480ca4899c9bd6a8ca0de7db2bdfdd3cd305c39689f348550aa846e53229a6c894d315be6c9ddc7df
 EBUILD xf86-video-intel-2.21.3.ebuild 1512 SHA256 8ca50a9ea3d66193b1f1aba62156dec47b2ffbd90e176a5e213505acc59f1389 SHA512 a185a17c3b25dcb0651eed70cb1174f37b1b02964437edce47e72b43513e2450d6340fceb9a2626f44392789b115e8a75eb27aced00b289d776a2c2878f16438 WHIRLPOOL 9d287925df901372ead08d8737373a97601ddf0dd0ad10fb2b6adf3349fec0279591a5f7bd941817514a8f83d090f5aa233dd420a4ae79abd2daec0dc78c3900
 EBUILD xf86-video-intel-2.9.1.ebuild 776 SHA256 4c1d2a0b50b0f4355e894395db96d4f975a52f42ef38a7ea29da7740ee61e86b SHA512 d021f1aaacc24581dff5851ba613ce980e437ca8640037acf02a54a4c4e13c7b60df21f94ee93e4402e481ac67c4c94fd57806749393f5719573a9e77110f845 WHIRLPOOL c28e1ce131b3fd3d122450ce8f23c21665282415d0ec9ca81aac48e764462d449691c334e86e42b223a3c0f8ccea32820c5e1b8e47802a305589725fb39a5109
-MISC ChangeLog 53042 SHA256 01021418dfa991ad419205850fea9787824fbef0086ae8648f4dd1eefeef504c SHA512 bb3d43070c029643783474d683633b76140623d675df7a6b641f277713153631d7ce3d402d2ee665f20113cbefaac108e5b2073095056b46cf088af5d6756f9c WHIRLPOOL 25da4338a7bf82dfc2025048ac96d11bb8c5548e3a6d4a2c4fbd8e539552dfb2f647624b0aaef0a2e94788f2d78bb9af799707d2f013c4dd993b7835279c4b1a
+MISC ChangeLog 53467 SHA256 afecc3e88d210c48526254d38d3b7ab76439631cb08c7c93eb89ed2f13350f36 SHA512 d2d35a21589e56e270f04a0d680a05858538a8345c094d5ff662d0f05c99ab4f8d4d218177406c0448ccd0492314858668213e788a4c8ec37e35c98a6f70e702 WHIRLPOOL 7e6d2a0dbe5ba20f0e91fc7a08df0c806567ab6b82d788d7ad8eea050c17e262e0c1d8ce9325731dff8cef91760364bd23c8b8c2f07d6040919bedf33c14fce3
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.19-discard-mappings.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.19-discard-mappings.patch
deleted file mode 100644
index a37b2e1ffb42..000000000000
--- a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.19-discard-mappings.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From de28027ffc649920268ae6fdd64146f08310e8a4 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 30 Jan 2013 08:42:48 +0000
-Subject: sna/dri: Make sure we discard the existing mappings when swapping GPU bo
-
-If the GPU bo is currently mapped to the Pixmap, we need to be sure to
-invalidate that mapping if we swap the GPU bo (for SwapBuffers). If we
-forget, we leave a dangling pointer to chase.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60042
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
-index 15b87dd..e33cd78 100644
---- a/src/sna/sna_dri.c
-+++ b/src/sna/sna_dri.c
-@@ -498,6 +498,12 @@ static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
- 	if (priv->gpu_bo != bo) {
- 		kgem_bo_destroy(&sna->kgem, priv->gpu_bo);
- 		priv->gpu_bo = ref(bo);
-+		if (priv->mapped) {
-+			assert(!priv->shm && priv->stride);
-+			pixmap->devPrivate.ptr = PTR(priv->ptr);
-+			pixmap->devKind = priv->stride;
-+			priv->mapped = false;
-+		}
- 	}
- 	if (bo->domain != DOMAIN_GPU)
- 		bo->domain = DOMAIN_NONE;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
index 551c54b42870..f8660570fed7 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.11 2013/01/02 21:37:45 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.12 2013/03/11 14:23:32 chithanh Exp $
 
 EAPI=4
 
@@ -12,7 +12,8 @@ DESCRIPTION="X.Org driver for Intel cards"
 KEYWORDS="amd64 x86 ~amd64-fbsd -x86-fbsd"
 IUSE="glamor sna"
 
-RDEPEND="x11-libs/libXext
+RDEPEND="<x11-base/xorg-server-1.13.49
+	x11-libs/libXext
 	x11-libs/libXfixes
 	x11-libs/libXvMC
 	>=x11-libs/libxcb-1.5
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19-r1.ebuild
deleted file mode 100644
index cd90543fe602..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2013 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.20.19-r1.ebuild,v 1.1 2013/01/31 14:54:31 chithanh Exp $
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="|| ( glamor sna uxa )"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	glamor? (
-		x11-libs/glamor
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/resourceproto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-discard-mappings.patch
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-		$(use_enable glamor)
-		$(use_enable sna)
-		$(use_enable uxa)
-		$(use_enable udev)
-		$(use_enable xvmc)
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild
deleted file mode 100644
index 56d23ab45c8d..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 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.20.2.ebuild,v 1.6 2013/01/02 21:37:45 mattst88 Exp $
-
-EAPI=4
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXvMC
-	>=x11-libs/libxcb-1.5
-	>=x11-libs/pixman-0.27.1
-	x11-libs/xcb-util
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	glamor? (
-		x11-libs/glamor
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-		$(use_enable glamor)
-		$(use_enable sna)
-		--enable-xvmc
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.0.ebuild
deleted file mode 100644
index 8d8594f3d1e0..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 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.21.0.ebuild,v 1.1 2013/02/05 03:22:26 mattst88 Exp $
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="|| ( glamor sna uxa )"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	glamor? (
-		x11-libs/glamor
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/resourceproto"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-		$(use_enable glamor)
-		$(use_enable sna)
-		$(use_enable uxa)
-		$(use_enable udev)
-		$(use_enable xvmc)
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.2.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.2.ebuild
deleted file mode 100644
index f124dbf4f320..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.21.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 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.21.2.ebuild,v 1.1 2013/02/11 19:28:34 remi Exp $
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="|| ( glamor sna uxa )"
-
-RDEPEND="x11-libs/libXext
-	x11-libs/libXfixes
-	>=x11-libs/pixman-0.27.1
-	>=x11-libs/libdrm-2.4.29[video_cards_intel]
-	glamor? (
-		x11-libs/glamor
-	)
-	sna? (
-		>=x11-base/xorg-server-1.10
-	)
-	udev? (
-		virtual/udev
-	)
-	xvmc? (
-		x11-libs/libXvMC
-		>=x11-libs/libxcb-1.5
-		x11-libs/xcb-util
-	)
-"
-DEPEND="${RDEPEND}
-	>=x11-proto/dri2proto-2.6
-	x11-proto/resourceproto"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dri)
-		$(use_enable glamor)
-		$(use_enable sna)
-		$(use_enable uxa)
-		$(use_enable udev)
-		$(use_enable xvmc)
-	)
-	xorg-2_src_configure
-}
-
-pkg_postinst() {
-	if linux_config_exists \
-		&& ! linux_chkconfig_present DRM_I915_KMS; then
-		echo
-		ewarn "This driver requires KMS support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Graphics support --->"
-		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
-		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
-		ewarn "	      i915 driver"
-		ewarn "      [*]       Enable modesetting on intel by default"
-		echo
-	fi
-}