x11-drivers/xf86-video-intel: Bring 2.20.2 back from the dead for bug #439420

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64

3 files changed, 61 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 5eea7f92b48c..91c0c40630ea 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.108 2012/10/21 19:30:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.109 2012/10/24 06:24:45 remi Exp $
+
+  24 Oct 2012; Rémi Cardona <remi@gentoo.org> +xf86-video-intel-2.20.2.ebuild:
+  Bring 2.20.2 back from the dead for bug #439420.
 
   21 Oct 2012; Rémi Cardona <remi@gentoo.org> -xf86-video-intel-2.20.0.ebuild,
   -xf86-video-intel-2.20.1.ebuild, -xf86-video-intel-2.20.2.ebuild,
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index c3d7e287f9db..b126caf17f99 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -15,6 +15,7 @@ DIST xf86-video-intel-2.18.0.tar.bz2 1424467 SHA256 dce63e33ccfada39ef1e1e6768df
 DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc SHA512 988f231570cdd7e5c60880472c8bee765def040addf1fa6e5bc9e8a8722b5500d4ae2b798383dc90f2ca3df439e230c4df2d7e3f7cb50341d2d3d38486520292 WHIRLPOOL a19605d2473e72fc4e81a7a327a9b8e9534bdfceca64b44a3d0fd62bf031c9ec10c7d12379b9ca327bde8bc90e15c73cee7ef2de71de00c92bc70969f2a91d37
 DIST xf86-video-intel-2.20.10.tar.bz2 1643190 SHA256 df41a28c3d877f3c5e87cd7d840f51fd38dde8bc91f5f0d09510fb8e2336cdcd SHA512 2ddb0ceb8540640cbdf0817f84dcc62d86b3a335377c905993084d54563769aa6c572a97c22db3e184d45e885bfb6b7f0a388632dd2d1fcc5f41ae82c1137c6d WHIRLPOOL 40083853926a9cbb802b811746b3c1fcdaa9f6e0d50a4efd0389eab75ec44de17cf6240c992cc3ad318a4a105e8e3b2d6d0cea4d4614e05b5f0475498f6f7163
 DIST xf86-video-intel-2.20.12.tar.bz2 1645262 SHA256 39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c SHA512 00d83c517cde1ca02088e8e5faccf924ec6aa3dd17a2850288bba0a2cb6e58f09829cc530b4ed586ef796149dce4ad204581ef6327c1d4cc15538326f9e51d21 WHIRLPOOL c4156610d6144e7d60e55ab28d295191e4406a97e9faf3f51816781790300891363658433910879ae22698a65706283ecb244d59edc3fb3ae3330a12aadfbd3e
+DIST xf86-video-intel-2.20.2.tar.bz2 1559622 SHA256 4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9 SHA512 bbb5bd42a31b67003ef440ce55593bc78feaf20a31bbf68b1152ad4dffbbb7f9a3581e63775024829d21260fc2d4e363fa47d9dba404e7a44bfced418eb6a940 WHIRLPOOL 40bd264ed3636be8117d7e2036bc044a4bdc074997765c851ce2097685e11cd241ff34cbf6611710e20f45210d0a5a81d61c96eaf6d33af48e44ed8104b63247
 DIST xf86-video-intel-2.20.8.tar.bz2 1632882 SHA256 2a126b2bb93b8d9db5eef68f1496e83713fd51ac435a7fafc7a36ff9c7ca83e7 SHA512 3e758e5ef6a0dc715e39f2efca65affb8e7bf052742ef61067f7cdec58af74dacc74031320d22b733980a5717bbd97cb799ec38a9bb10efcfb4f9e89b2ac99aa WHIRLPOOL ee5afea9ac2218796a6c7477392b70725875fb2cbaaf776a34ddbfeffa7102c029e171685cf416b44c8745cc852bb250d6e3b8dc7ea77f702d36cc23edaeb5b5
 DIST xf86-video-intel-2.20.9.tar.bz2 1636882 SHA256 b9830c9fdaf2f64648cd45807883821f14dd91f9ff1cfa59af11035f62dc9389 SHA512 6dce784ec45f13d0d0d856ab09f958057aec12ef510e2afff876bf5f77d369ed0a2e4b0c46c2eac84a024451f5b3d5179f6495c59b3d0dfd1b681cb97f3ad8a5 WHIRLPOOL 1f4261fef68d8319234ac886d5a9576431443c0cd6f15bcf1f43546ef51ff8746c9aca957cd94e1964affb1a3191c00a730bdb73faed8ab3e7ab77bbeb422b9f
 DIST xf86-video-intel-2.8.1.tar.bz2 748928 SHA256 c6778fc7e43c701d5829514329ee70f5dc539ff8f5b3c79587577b617a535c81 SHA512 9d1f7e00017d812efef66e06a8be46577ca6c96bef5515981dbcd568e13c643a9018c5e3f425b1ec195571772316bbb59c3e7782528620c6ac7a7f3684116246 WHIRLPOOL 36b189f4fb7637043666d535c50c82168c6aebe577bfedafe8c1d53116645969e656a7e5c0fb39bb4f92c9b2f1a2ae1ef66a09bf8ebda457cedda84ce379ce30
@@ -30,9 +31,10 @@ EBUILD xf86-video-intel-2.18.0.ebuild 1299 SHA256 e7ac5cebb467afa74615baea43d069
 EBUILD xf86-video-intel-2.19.0.ebuild 1370 SHA256 54857f8823ee2d4a3d943e51dd0913714607b93480213d14ddd02b0bc47ca23c SHA512 3158705db8a31d7d62621bbff736134db78d5b7a534aa7e0819c8137eaa89ebb12a161098f7c13b61377861bc74cdce40990eb9a729e3e00d43f7683927599ca WHIRLPOOL 4cf754091d5e22304b52bbd323144290ca022fbe33a7ec7ae2502b591e4bae206a93dcb02a511434f0fc1f9df6d1ce287d9844cf521aedb505dfc375371f9887
 EBUILD xf86-video-intel-2.20.10.ebuild 1580 SHA256 a1afa131583636b5c89ed8957c2ff0f15e8a46dc10a4c189e31d0d28e2ab7f62 SHA512 ab9916a7f87c7d7c8749b7ca4a6eb360d4def6025cdaaf4623a37e4146e01d9d99463877f7531337e8102e5324fe7716ec030eaeec4acc9dd4f420846f4ec8e5 WHIRLPOOL b4c2016e5e26a2080230f90f2300fde1b021945bdb712454bd336b3114fb53507f1af69052bf205396e682b8bc5ba62449387b4decb4b1c2a8bbb7fa355ba0c9
 EBUILD xf86-video-intel-2.20.12.ebuild 1518 SHA256 8d5553b064ae4e7a08d68bef1861a6e430ad14c64a8911d950597e3ca0c5e442 SHA512 beacc07c22e70229c232cc7f563c496b0e4902ab7e764442f75fc4f10b4cc1906e16e3276f15a1b61de524405e77e8e5ba6427ce659c865349609b870f454b2b WHIRLPOOL 75c323696e46857fabc09b42a06f1a9dad9fa891bf6bfc9d49c865a8bd566ff5693e1f57b3407017c9e0f993154a5a0d2c582650b0eb32f81c0d00279f2ee120
+EBUILD xf86-video-intel-2.20.2.ebuild 1351 SHA256 33c4ee6cbffe6992130b90189770a08534e9ed34090aa0375b61bede6ee120d6 SHA512 38c760e09bfe61a7b811989eeffbcc0578e358f77b5cb37e918357553fabf564bf15db63bbd35b05ff521ecf5c6b6518d8d3bc6de937e0d293111a52532232c6 WHIRLPOOL 7d97ff47dedcd104b00c78f6a5024c228a21c659fb76be0095394b0d575cafb9c0c37844e767cc81530e5b785cce4091ccd23ed3f045cdf66c0fc21ed7e8354f
 EBUILD xf86-video-intel-2.20.8.ebuild 1517 SHA256 143a8c1fe3df39bed3c8ba45405a07dad519f4f9ea3c095ba81f28432f00d447 SHA512 cd10862bbb53b35fd96f759e0821115fa778b43ef1bc87d406950d1835120fdb10a8b5d113b07d5979c612d7ab0aa61b53b6dfa713586dda112183d51c284459 WHIRLPOOL 6ef8c728fb8bfaaeee0c321007e984d6677f868fc5bcddd0f7bf9d4dc4134cf777b77c6158a21ad67dd5ccaef8e649eb740ef28e3b32e6d4488e056d0ba1954c
 EBUILD xf86-video-intel-2.20.9.ebuild 1521 SHA256 c56899a19c8699d6968763fd82df2d5489e44aacb6243cc86ae80a0403e36325 SHA512 6d15b631e32c806c58ac46136c96b0905ed38be99b39574b726e2be1a0c2299cb07fd451593db6ed360b8615d66be889533a6218031f1783a51c1fba1891e204 WHIRLPOOL 14daf087f7beb4ad452f3422310241cba285c9634a2a9bd710c1ad29caee2074efdab4222a13646ef71c479df89b0c5cb6acb2bd723357d3bf1d24866157c02b
 EBUILD xf86-video-intel-2.8.1.ebuild 794 SHA256 d012b3c43258b9e5e06d56e1d4aec2711644443eb927e800f9525bdc9610bf2f SHA512 e3791c7e80bb544618893401fc9dd157e5ce6d18727630ca7dec24ef8687bbfdfa2954fb70eebe31b0179c79e94861b6d4f2dedfd774017a1b492bad5944c36f WHIRLPOOL 93c4340495ec0b6fe6862a7e91bc8c748f96148e89980041bb0bf77e9982165af23f2e40b396fa0c4ebe9966b2d228182fd87403744c2f86cd0cfea229c3ac49
 EBUILD xf86-video-intel-2.9.1.ebuild 776 SHA256 7093496b4a55550f1f2a11b0f405be716f5da354947ff7380a052e4fd6954129 SHA512 29baaa622d1f6f3a8109174fe93569a5c1f25a862b81d6b72ca26e8ec8afdec3a072fce500a1bf30a11048650dc1eac1acef1dbae8e7e3506918e97ce0fda774 WHIRLPOOL 5377d90052588bebdae21154d4ff34703e9f5c468a76cf0fae92901e65895cc395d133f225ff777c5dbd250c995b11e60c4a6e8faafc1f65e1d81f86efffab41
-MISC ChangeLog 49433 SHA256 0fffc5fec400d68ffea96ba1403f7cbdf78f0871153665236505d3972be9e066 SHA512 68af0b6c75941f05464d1ee07c32295321fbee8de768293efa7dc61923359c960a12c007d31f00c093574f1bc62a5350539a4a9fb64bc5cf65f8e360eb43febe WHIRLPOOL 9515767cae54085ad7a448af4d09a261c5152951a3e80931a1a8f4f0e35d8a8a6214ea4e0b778286b08005696095b1c7a41b60deecbba10a74c38d40b96341f0
+MISC ChangeLog 49565 SHA256 da27b40722fa72859111ba13840b163a63cd882ad3baf671583e27a9a459bfc2 SHA512 9d46f0812f86076a5be5dfd2730fccc1baa8e085f5f4dcb18861f931bc976644904f6a6a724f96caa12a9766a93ac86308359f93f60bfad60c7a0c09af8459ac WHIRLPOOL 0da9f6f46c93d010a89cb381afc2737c8b509391ab686236d3917e1e480cc9a0b3b2d106417ad9e3edef929c18b195d954bfc8bce910096f3869ae82044f8924
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
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
new file mode 100644
index 000000000000..a26afd804bda
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 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.4 2012/10/24 06:24:45 remi Exp $
+
+EAPI=4
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~ia64 ~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
+}