Add patch for bug #454412. Remove old.

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

8 files changed, 50 insertions, 272 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 2a8966e3abce..f3926f03e45d 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,16 @@
 # 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.123 2013/01/23 17:06:34 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.124 2013/01/31 14:54:31 chithanh Exp $
+
+*xf86-video-intel-2.20.19-r1 (31 Jan 2013)
+
+  31 Jan 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.15.ebuild,
+  -xf86-video-intel-2.20.16.ebuild, -xf86-video-intel-2.20.17.ebuild,
+  -xf86-video-intel-2.20.18.ebuild, -xf86-video-intel-2.20.19.ebuild,
+  xf86-video-intel-2.20.13.ebuild:
+  Add patch for bug #454412. Remove old.
 
 *xf86-video-intel-2.20.19 (23 Jan 2013)
 
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index bec9c260ca0c..f887f8415fd2 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,20 +1,13 @@
+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.15.tar.bz2 1654806 SHA256 09ba6878746193951b5471d9ed54fa6115fea97477ed33d0b9bd9b8cafd9e163 SHA512 dca0f58751b8eb190e585fdcb6b45e8f1d5a73967d3d7c06d52dcd9a9f7a2d3b2231e04cb93fafe4403b710db2c34fda978e9483fe6dcdb7cc470de5d32cae36 WHIRLPOOL ac1bb6cb181300eb0c2f5daf0277942d3a3bc500dfe7488074a03f2b8417572e5875afd739fc3904f21b256b9d47900c10e30a3185c14d8a952ca1f2a884a794
-DIST xf86-video-intel-2.20.16.tar.bz2 1660502 SHA256 308646d1d4b07e5c581cd7cca133b0e3410a1a3911a58d7d49b8ea106b64d0ba SHA512 430aa253f4af9dcf475465dbade88b2c80d2e60bbfd42414c0788c0deb241c39f0f844fa49cd41a9f977b5835d87af907c169da75f1044e4c689ab8da5104e17 WHIRLPOOL a74830c9580a832c69dbb1a392d6822de642292f84c1a56f0eec88c4f9e12c84157927dc4b038f10e0777348c2ca585024d5b3d7641fcf15119fabfe4d0c6b79
-DIST xf86-video-intel-2.20.17.tar.bz2 1657676 SHA256 0bf5e9bd82b2643e06503665545f5cc8c3e24ab48ca4fe84f4e9e7ebbb9e7dbc SHA512 dbbc70f87d14abc7b3e71f8b54a9bec8263590ee4af491b2218c9417c6a9dcc68526fe535465f10eae715147c1a4918d84e67fb4862c70b89154c0d6b5038858 WHIRLPOOL 31424ffd2be8adcfd549d0df24cf2e37ef945469a602e4fae970631aae03d1714e4f3cc13d452214b4f2a5d0566d06569d8dea58f5dfce09ee3f744bedaa709b
-DIST xf86-video-intel-2.20.18.tar.bz2 1663997 SHA256 f3daedf9571b04234053507940ba0a221abfcd294c3c350ff49eaf499b8437b5 SHA512 319c451e1fbcf45499fbb79874756410426813b6210e498f1a45277dc1fb4ec0d17c36fa24a5821099c65147089f463671351f9244f74d773c60bb47ee3f5f2b WHIRLPOOL 02e1268f456f5cca48babf945e6ee7d0e8d9cee2fbf8a11b552be72055276be83cd29dbea66440c4999355847271f2f5e1f92e14450de8a69a757af4dfe65ef2
 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.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.20.13.ebuild 1515 SHA256 f896d7999de9993f4d79cab048b35980b8d2f6009426628df7b3378fdfe2a180 SHA512 2f16066a6cf096030d70e3439d04b4999c5fa7f693b3ee3e38d2cc59d1cc566577e827d807c028845a725dd10f46ee557f42804fd28b7ec0c5f2891778101573 WHIRLPOOL a9090c7e66733c7f8a4c5a80951d9da3652c37a96e6cc50d49765eafdee270df3c10b2c3608bf23adad2e3ac6825d02582330b21f4755c4b32206c41653d59fe
-EBUILD xf86-video-intel-2.20.15.ebuild 1517 SHA256 7996cdd384906da0688660530fe3b495ce5742257501c85340e5e65223a1556b SHA512 549a36aeb1b670d856f7f4b7f01cc8b383868efe89664e1ad8f83e51e09083efff1d1c206ffdfc2e005ada9c623b1e88e5a157dca519525e90faa01a20bec692 WHIRLPOOL fcfcbb7114ca2140984c2ccaabddddbc27a94b10a0f3ccf586be976358fff3bdc6ff8609bc96dc3847d36212d86ada4fad0e6ceb7e29a2a9a466427a2d55405e
-EBUILD xf86-video-intel-2.20.16.ebuild 1517 SHA256 3bd5385d426bb9b9992b21a7b8460679b3d5a40dc543075492bdd0f48fcf6955 SHA512 36365c06eb68f9286f34fd067e3d46bfb84a61d0a06d9323b08b50bce16e78fc2999e6cefadbd66a61e9a486deccd541f2f87a31f77ff6ecd67b7c0ef463dcd4 WHIRLPOOL 7bc6627a255bea033b01552f6cf28340c5b8815e968da58ea270579f17bb0e0b69fd14a89b0892af7aa189c09c0bdb3edbf9ed5fbe76b2447850f420c91c1e80
-EBUILD xf86-video-intel-2.20.17.ebuild 1517 SHA256 31f8e6dbdb53ae88d9a3c8ff11a778faf71b8516da01ec85c4609cbc322660c4 SHA512 b757f35c8caf12fde6d8237d5c139cf1e654e2c879ebafc06a161a5a962e5f403bd5e00e04ceaa390b798fedd77a2bcb267796f6e5b8cd9757be506d65570e65 WHIRLPOOL fbbbc40b7046d89451154dad449f1f48bae97cf72b7c9f5f0dedae609d6f0ae445023585c11d78fdc8f37d5840417937bed5b51380dc804067df2206549b7e00
-EBUILD xf86-video-intel-2.20.18.ebuild 1513 SHA256 a52de95aeb129fd9ce1f8855ec11c1d58412aef20e4cd21d52050791d04d02c0 SHA512 53aa1328967cb41f05b5112d66ebf00d513d7511717f097f3f5544208f077e3867bab45c3e97597343059f5c1fec1046ae175c2e64859e759375f93d4ca536fa WHIRLPOOL 50cefc9b2d3bcce5ad62a40477068ac73258668b1e23beeadbcff69adb2d3550996ca8170612f0f973a73e7cd273884551bd10ca726a8e87433681d9ae00c42b
-EBUILD xf86-video-intel-2.20.19.ebuild 1517 SHA256 90ce7c96e538fc6b68b326a3521214f195f7d5558f37000a14efd89e435965d8 SHA512 a3ec65a4c89bbcaef494c1ed51d71b10934b50315de94256be5a40fc1e7b26bd5e0e436d39f89aa86322b2ca64505f8f44e397c6693271d3130bfcd2e24117f0 WHIRLPOOL b9198bdbd17165cebca7c8919c21972ddc3dc644d8c642cc1b1fce33b4f96f2d9155659cbe755b5638c97167826e1e1295219daa17df31631248139f2bfe8f10
+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.9.1.ebuild 776 SHA256 4c1d2a0b50b0f4355e894395db96d4f975a52f42ef38a7ea29da7740ee61e86b SHA512 d021f1aaacc24581dff5851ba613ce980e437ca8640037acf02a54a4c4e13c7b60df21f94ee93e4402e481ac67c4c94fd57806749393f5719573a9e77110f845 WHIRLPOOL c28e1ce131b3fd3d122450ce8f23c21665282415d0ec9ca81aac48e764462d449691c334e86e42b223a3c0f8ccea32820c5e1b8e47802a305589725fb39a5109
-MISC ChangeLog 52126 SHA256 d1eb7026c12239e301940261657aa2b37b7991a0f216626bc43b676b4b9d8b63 SHA512 c729c69743c2d311e6fcfe379a2c203319159cf17d25d699b50dea150eeab77539f1f84f1aaef9834f118e192465d7a7442684f96fe33ce82fc7c692002fea50 WHIRLPOOL e4ab181509b9ba90154e9e042e78c9057c0cf2fe346109ca923d27a40b47ad4260b6038ffb43390ea0ebdcb21d14226aed09b9c97adc9c35bf36b0c1d7df4aba
+MISC ChangeLog 52587 SHA256 26c11fa94f25c1296a777574e45163a86eaad80f388e5a9b0bccc9b93962cf7b SHA512 6702b7437ffead0d5346d00d711f032615b77fbd5d3da73f9502d3083f77297be2cc0f178c18b9d60d46f227616fe0bac42eb5b8a15c7b753939b72b9aee3a4d WHIRLPOOL 4be427ad32c8d603a0761d9362e04f5385411cbdd27b10a02e3d629d0d960bd032e340edd2795e77ccb3c2e544cb7e0721710ac70cac71ff4b84c025c411da97
 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
new file mode 100644
index 000000000000..a37b2e1ffb42
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.19-discard-mappings.patch
@@ -0,0 +1,31 @@
+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.20.15.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.15.ebuild
deleted file mode 100644
index 979c19ed5730..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.15.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.20.15.ebuild,v 1.3 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 +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.20.16.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.16.ebuild
deleted file mode 100644
index 8e068bcc65e5..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.16.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.20.16.ebuild,v 1.3 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 +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.20.17.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.17.ebuild
deleted file mode 100644
index 999ce201960e..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.17.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.20.17.ebuild,v 1.1 2013/01/10 00:26:28 chithanh 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 +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.20.18.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.18.ebuild
deleted file mode 100644
index c6a1a6aba8c1..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.18.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.20.18.ebuild,v 1.1 2013/01/17 20:08:09 remi 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 +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.20.19.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19-r1.ebuild
index 7c76e0ec5495..cd90543fe602 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19-r1.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.20.19.ebuild,v 1.1 2013/01/23 17:06:34 chithanh Exp $
+# $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
 
@@ -37,6 +37,10 @@ DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6
 	x11-proto/resourceproto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-discard-mappings.patch
+)
+
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable dri)